From ff1598e97245ba8c92e8ef5e80781d7c6ce4f3d7 Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 16 Oct 2018 12:30:51 +0300 Subject: [PATCH] Macos: set ENABLE_EMBEDDED_COMPILER=0 by default (because contrib/llvm temporary broken under macos) (#3382) --- cmake/find_llvm.cmake | 7 +++++-- docker/server/Dockerfile | 2 +- utils/travis/normal.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/find_llvm.cmake b/cmake/find_llvm.cmake index d9805b0330..e540c3eafa 100644 --- a/cmake/find_llvm.cmake +++ b/cmake/find_llvm.cmake @@ -1,5 +1,8 @@ -option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile' option for query execution" 1) -option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library. Default: system library for quicker developer builds." ${APPLE}) +# Broken in macos. TODO: update clang, re-test, enable +if (NOT APPLE) + option (ENABLE_EMBEDDED_COMPILER "Set to TRUE to enable support for 'compile' option for query execution" 1) + option (USE_INTERNAL_LLVM_LIBRARY "Use bundled or system LLVM library. Default: system library for quicker developer builds." ${APPLE}) +endif () if (ENABLE_EMBEDDED_COMPILER) if (USE_INTERNAL_LLVM_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/llvm/llvm/CMakeLists.txt") diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index b2e00530b7..4ae3bee4b4 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -39,4 +39,4 @@ ENV CLICKHOUSE_CONFIG /etc/clickhouse-server/config.xml ENTRYPOINT ["/entrypoint.sh"] -CMD /usr/bin/clickhouse-server --config=${CLICKHOUSE_CONFIG} \ No newline at end of file +CMD /usr/bin/clickhouse-server --config=${CLICKHOUSE_CONFIG} diff --git a/utils/travis/normal.sh b/utils/travis/normal.sh index 16482c3f18..7f45641d45 100755 --- a/utils/travis/normal.sh +++ b/utils/travis/normal.sh @@ -32,7 +32,7 @@ cmake $CUR_DIR/../.. -DCMAKE_CXX_COMPILER=`which $DEB_CXX $CXX` -DCMAKE_C_COMPIL `# Use all possible contrib libs from system` \ -DUNBUNDLED=1 \ `# Disable all features` \ - -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_JEMALLOC=0 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 -DENABLE_POCO_ODBC=0 -DENABLE_ODBC=0 -DUSE_INTERNAL_LLVM_LIBRARY=0 $CMAKE_FLAGS + -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DENABLE_EMBEDDED_COMPILER=0 -DUSE_INTERNAL_LLVM_LIBRARY=0 -DENABLE_JEMALLOC=0 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 -DENABLE_POCO_ODBC=0 -DENABLE_ODBC=0 $CMAKE_FLAGS ninja clickhouse-bundle -- GitLab