Addition to prev. revision [#CLICKHOUSE-2]

ci/install-os-packages.sh

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

ci/jobs/quick-build/run.sh

@@ -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"
 
-[[ $(uname) == "FreeBSD" ]] && COMPILER_PACKAGE_VERSION=devel
+[[ $(uname) == "FreeBSD" ]] && COMPILER_PACKAGE_VERSION=devel && export COMPILER_PATH=/usr/local/bin
 
 . get-sources.sh
 . prepare-toolchain.sh

dbms/CMakeLists.txt

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

libs/libdaemon/CMakeLists.txt

@@ -17,4 +17,4 @@ endif ()
 target_include_directories (daemon PUBLIC 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})