diff --git a/dbms/programs/odbc-bridge/CMakeLists.txt b/dbms/programs/odbc-bridge/CMakeLists.txt index 73574f8dc2e..d32c87033ff 100644 --- a/dbms/programs/odbc-bridge/CMakeLists.txt +++ b/dbms/programs/odbc-bridge/CMakeLists.txt @@ -33,9 +33,11 @@ endif () clickhouse_program_add_library(odbc-bridge) -# clickhouse-odbc-bridge is always a separate binary. -# Reason: it must not export symbols from SSL, mariadb-client, etc. to not break ABI compatibility with ODBC drivers. -set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic") +if (OS_LINUX) + # clickhouse-odbc-bridge is always a separate binary. + # Reason: it must not export symbols from SSL, mariadb-client, etc. to not break ABI compatibility with ODBC drivers. + set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic") +endif () add_executable(clickhouse-odbc-bridge odbc-bridge.cpp) set_target_properties(clickhouse-odbc-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..) diff --git a/dbms/src/Common/tests/symbol_index.cpp b/dbms/src/Common/tests/symbol_index.cpp index dde5ce185ae..baab1de1fe1 100644 --- a/dbms/src/Common/tests/symbol_index.cpp +++ b/dbms/src/Common/tests/symbol_index.cpp @@ -12,11 +12,11 @@ NO_INLINE const void * getAddress() return __builtin_return_address(0); } -using namespace DB; - int main(int argc, char ** argv) { #ifdef __ELF__ + using namespace DB; + if (argc < 2) { std::cerr << "Usage: ./symbol_index address\n"; diff --git a/dbms/src/Interpreters/tests/hash_map_string_3.cpp b/dbms/src/Interpreters/tests/hash_map_string_3.cpp index 850a9268c5d..2309a29c531 100644 --- a/dbms/src/Interpreters/tests/hash_map_string_3.cpp +++ b/dbms/src/Interpreters/tests/hash_map_string_3.cpp @@ -18,7 +18,7 @@ #include #include -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ #include #endif @@ -164,7 +164,7 @@ struct FNV1a }; -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ struct CrapWow { @@ -254,7 +254,7 @@ struct SimpleHash if (size < 8) { -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ return hashLessThan8(x.data, x.size); #endif } @@ -291,7 +291,7 @@ struct VerySimpleHash if (size < 8) { -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ return hashLessThan8(x.data, x.size); #endif } @@ -342,7 +342,7 @@ struct SMetroHash64 }; -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ /*struct CRC32Hash { @@ -499,7 +499,7 @@ int main(int argc, char ** argv) if (!m || m == 3) bench (data, "StringRef_SimpleHash"); if (!m || m == 4) bench (data, "StringRef_FNV1a"); -#ifdef __SSE4_1__ +#ifdef __SSE4_2__ if (!m || m == 5) bench (data, "StringRef_CrapWow"); if (!m || m == 6) bench (data, "StringRef_CRC32Hash"); if (!m || m == 7) bench (data, "StringRef_CRC32ILPHash"); diff --git a/utils/zookeeper-adjust-block-numbers-to-parts/CMakeLists.txt b/utils/zookeeper-adjust-block-numbers-to-parts/CMakeLists.txt index d2357ec755d..2fdd87a4412 100644 --- a/utils/zookeeper-adjust-block-numbers-to-parts/CMakeLists.txt +++ b/utils/zookeeper-adjust-block-numbers-to-parts/CMakeLists.txt @@ -1,2 +1,3 @@ add_executable (zookeeper-adjust-block-numbers-to-parts main.cpp ${SRCS}) +target_compile_options(zookeeper-adjust-block-numbers-to-parts PRIVATE -Wno-format) target_link_libraries (zookeeper-adjust-block-numbers-to-parts PRIVATE dbms clickhouse_common_zookeeper ${Boost_PROGRAM_OPTIONS_LIBRARY}) diff --git a/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp b/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp index 3e449043adc..02aa2ddbcda 100644 --- a/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp +++ b/utils/zookeeper-adjust-block-numbers-to-parts/main.cpp @@ -179,7 +179,7 @@ void setCurrentBlockNumber(zkutil::ZooKeeper & zk, const std::string & path, Int if (number != current_block_number) { char suffix[11] = ""; - sprintf(suffix, "%010ld", current_block_number); + sprintf(suffix, "%010lld", current_block_number); std::string expected_path = block_prefix + suffix; std::cerr << "\t" << path_created << ": Ephemeral node has been created with an unexpected path (expected something like " << expected_path << ")." << std::endl;