Skip to content

Commit b045d7c

Browse files
committed
Disable EMBEDDED_COMPILER for mac arm64
1 parent de53dc1 commit b045d7c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
test_main
1717
/buildlib
1818
/builddbg
19+
/buildx86
1920
/build
2021
/build_*
2122
/build-*

chdb/build.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,13 @@ if [ "$(uname)" == "Darwin" ]; then
1515
PYINIT_ENTRY="-Wl,-exported_symbol,_PyInit_${CHDB_PY_MOD}"
1616
# if Darwin ARM64 (M1, M2), disable AVX
1717
if [ "$(uname -m)" == "arm64" ]; then
18+
CMAKE_TOOLCHAIN_FILE="-DCMAKE_TOOLCHAIN_FILE=cmake/darwin/toolchain-aarch64.cmake"
1819
AVX_SUPPORT="-DENABLE_AVX=0 -DENABLE_AVX2=0"
20+
EMBEDDED_COMPILER="-DENABLE_EMBEDDED_COMPILER=0"
21+
export CXX=/usr/local/opt/llvm/bin/clang++
22+
export CC=/usr/local/opt/llvm/bin/clang
1923
else
24+
EMBEDDED_COMPILER="-DENABLE_EMBEDDED_COMPILER=1"
2025
# disable AVX on Darwin for macos11
2126
if [ "$(sw_vers -productVersion | cut -d. -f1)" -le 11 ]; then
2227
AVX_SUPPORT="-DENABLE_AVX=0 -DENABLE_AVX2=0"
@@ -39,6 +44,7 @@ elif [ "$(uname)" == "Linux" ]; then
3944
UNWIND="-DUSE_UNWIND=1"
4045
PYINIT_ENTRY="-Wl,-ePyInit_${CHDB_PY_MOD}"
4146
AVX_SUPPORT="-DENABLE_AVX=1 -DENABLE_AVX2=1"
47+
EMBEDDED_COMPILER="-DENABLE_EMBEDDED_COMPILER=1"
4248
else
4349
echo "OS not supported"
4450
exit 1
@@ -60,12 +66,13 @@ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_THINLTO=1 -DENABLE_TESTS=0 -DENABLE_CL
6066
-DENABLE_LIBRARIES=0 -DENABLE_RUST=0 \
6167
${GLIBC_COMPATIBILITY} \
6268
-DCLICKHOUSE_ONE_SHARED=0 \
63-
-DENABLE_UTILS=0 -DENABLE_EMBEDDED_COMPILER=1 ${UNWIND} \
69+
-DENABLE_UTILS=0 ${EMBEDDED_COMPILER} ${UNWIND} \
6470
-DENABLE_ICU=0 -DENABLE_JEMALLOC=0 \
6571
-DENABLE_PARQUET=1 -DENABLE_ROCKSDB=1 -DENABLE_SQLITE=1 -DENABLE_VECTORSCAN=1 \
6672
-DENABLE_PROTOBUF=1 -DENABLE_THRIFT=1 \
6773
-DENABLE_CLICKHOUSE_ALL=0 -DUSE_STATIC_LIBRARIES=1 -DSPLIT_SHARED_LIBRARIES=0 \
6874
${AVX_SUPPORT} \
75+
${CMAKE_TOOLCHAIN_FILE} \
6976
-DENABLE_AVX512=0 -DENABLE_AVX512_VBMI=0 \
7077
..
7178
ninja

0 commit comments

Comments
 (0)