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

Addition to prev. revision [#CLICKHOUSE-2]

Browse Source
This commit is contained in:
Alexey Milovidov 2018-05-15 00:37:56 +03:00
parent 95c71308d3
commit 3e79e8974f
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/install-os-packages.sh
View File

@ -78,11 +78,9 @@ case $PACKAGE_MANAGER in
;; ;;
gcc*) gcc*)
$SUDO pkg install -y ${WHAT/-/} $SUDO pkg install -y ${WHAT/-/}
export COMPILER_PATH=/usr/local/bin # Otherwise ld cannot link some binaries.
;; ;;
clang*) clang*)
$SUDO pkg install -y clang-devel $SUDO pkg install -y clang-devel
export COMPILER_PATH=/usr/local/bin
;; ;;
git) git)
$SUDO pkg install -y git $SUDO pkg install -y git

2
ci/jobs/quick-build/run.sh
View File

@ -23,7 +23,7 @@ ENABLE_EMBEDDED_COMPILER=0
CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_TCMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0 -D ENABLE_POCO_MONGODB=0 -D ENABLE_POCO_NETSSL=0 -D ENABLE_POCO_ODBC=0 -D ENABLE_MYSQL=0" CMAKE_FLAGS="-D CMAKE_C_FLAGS_ADD=-g0 -D CMAKE_CXX_FLAGS_ADD=-g0 -D ENABLE_TCMALLOC=0 -D ENABLE_CAPNP=0 -D ENABLE_RDKAFKA=0 -D ENABLE_UNWIND=0 -D ENABLE_ICU=0 -D ENABLE_POCO_MONGODB=0 -D ENABLE_POCO_NETSSL=0 -D ENABLE_POCO_ODBC=0 -D ENABLE_MYSQL=0"
[[ $(uname) == "FreeBSD" ]] && COMPILER_PACKAGE_VERSION=devel [[ $(uname) == "FreeBSD" ]] && COMPILER_PACKAGE_VERSION=devel && export COMPILER_PATH=/usr/local/bin
. get-sources.sh . get-sources.sh
. prepare-toolchain.sh . prepare-toolchain.sh

1
dbms/CMakeLists.txt
View File

@ -147,6 +147,7 @@ target_link_libraries (clickhouse_common_io
${Poco_Data_LIBRARY} ${Poco_Data_LIBRARY}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${EXECINFO_LIBRARY} ${EXECINFO_LIBRARY}
${ELF_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )

2
libs/libdaemon/CMakeLists.txt
View File

@ -17,4 +17,4 @@ endif ()
target_include_directories (daemon PUBLIC include) target_include_directories (daemon PUBLIC include)
target_include_directories (daemon PRIVATE ${ClickHouse_SOURCE_DIR}/libs/libpocoext/include) target_include_directories (daemon PRIVATE ${ClickHouse_SOURCE_DIR}/libs/libpocoext/include)
target_link_libraries (daemon clickhouse_common_io clickhouse_common_config ${EXECINFO_LIBRARY}) target_link_libraries (daemon clickhouse_common_io clickhouse_common_config ${EXECINFO_LIBRARY} ${ELF_LIBRARY})