thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build

Browse Source
This commit is contained in:
Alexey Milovidov 2019-03-12 21:35:23 +03:00
parent 37b5e49508
commit e81d8e8b02
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -241,7 +241,7 @@ if (OS_LINUX AND NOT UNBUNDLED)
# There are two variants of C++ library: libc++ (from LLVM compiler infrastructure) and libstdc++ (from GCC).
if (USE_LIBCXX)
set (BUILTINS_LIB_PATH "")
if (COMPILER_CLANG)
if (COMPILER_CLANG)
execute_process (COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.builtins-${CMAKE_SYSTEM_PROCESSOR}.a OUTPUT_VARIABLE BUILTINS_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
endif ()
@ -365,7 +365,7 @@ if (ENABLE_TESTS)
include (cmake/find_gtest.cmake)
endif ()
if (USE_INTERNAL_LIBCXX_LIBRARY)
if (USE_LIBCXX AND USE_INTERNAL_LIBCXX_LIBRARY)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nostdinc++ -isystem ${LIBCXX_INCLUDE_DIR} -isystem ${LIBCXXABI_INCLUDE_DIR}")
endif ()
@ -398,7 +398,7 @@ if (DEFAULT_LIBS)
if (GLIBC_COMPATIBILITY)
add_dependencies(${target_name} glibc-compatibility)
endif ()
if (USE_INTERNAL_LIBCXX_LIBRARY)
if (USE_LIBCXX AND USE_INTERNAL_LIBCXX_LIBRARY)
add_dependencies(${target_name} cxx_static cxxabi_static)
endif ()
endif ()

4
contrib/CMakeLists.txt vendored
View File

@ -270,7 +270,7 @@ if (USE_INTERNAL_LLVM_LIBRARY)
add_subdirectory (llvm/llvm)
endif ()
if (USE_INTERNAL_LIBCXXABI_LIBRARY)
if (USE_LIBCXX AND USE_INTERNAL_LIBCXXABI_LIBRARY)
set (LIBCXXABI_USE_COMPILER_RT 1 CACHE INTERNAL "")
set (PACKAGE_NAME libcxxabi)
set (PACKAGE_VERSION 8.0.0svn)
@ -282,7 +282,7 @@ if (USE_INTERNAL_LIBCXXABI_LIBRARY)
add_subdirectory(libcxxabi)
endif()
if (USE_INTERNAL_LIBCXX_LIBRARY)
if (USE_LIBCXX AND USE_INTERNAL_LIBCXX_LIBRARY)
set (LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libcxx")
set (LIBCXX_USE_COMPILER_RT 1 CACHE INTERNAL "")
set (LIBCXX_CXX_ABI "libcxxabi" CACHE INTERNAL "")

2
dbms/src/Core/tests/CMakeLists.txt
View File

@ -9,7 +9,7 @@ add_executable (move_field move_field.cpp)
target_link_libraries (move_field PRIVATE clickhouse_common_io)
add_executable (rvo_test rvo_test.cpp)
target_link_libraries (rvo_test PRIVATE Threads::Threads)
target_link_libraries (rvo_test PRIVATE Threads::Threads ${DEFAULT_LIBS})
add_executable (string_ref_hash string_ref_hash.cpp)
target_link_libraries (string_ref_hash PRIVATE clickhouse_common_io)