Skip to content

Commit 9986b02

Browse files
auxtenauxten
committed
Use clang clang++ llvm 17
1 parent 55dfbde commit 9986b02

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎.github/workflows/build_arm_wheels.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
uname -a
3535
wget https://apt.llvm.org/llvm.sh
3636
chmod +x llvm.sh
37-
sudo ./llvm.sh 15
38-
which clang++-15
39-
clang++-15 --version
37+
sudo ./llvm.sh 17
38+
which clang++-17
39+
clang++-17 --version
4040
sudo apt-get install -y make cmake ccache ninja-build yasm gawk wget
4141
ccache -s
4242
- name: Update git
@@ -75,13 +75,13 @@ jobs:
7575
key: ${{ matrix.os }}
7676
max-size: 5G
7777
append-timestamp: true
78-
- name: remove old clang and link clang-15 to clang
78+
- name: remove old clang and link clang-17 to clang
7979
if: matrix.os == 'ubuntu-20.04'
8080
run: |
8181
sudo rm /usr/bin/clang
82-
sudo ln -s /usr/bin/clang-15 /usr/bin/clang
82+
sudo ln -s /usr/bin/clang-17 /usr/bin/clang
8383
sudo rm /usr/bin/clang++
84-
sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
84+
sudo ln -s /usr/bin/clang++-17 /usr/bin/clang++
8585
which clang++
8686
clang++ --version
8787
- name: Make linux-arm64

‎.github/workflows/build_wheels.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
uname -a
3737
wget https://apt.llvm.org/llvm.sh
3838
chmod +x llvm.sh
39-
sudo ./llvm.sh 15
40-
which clang++-15
41-
clang++-15 --version
39+
sudo ./llvm.sh 17
40+
which clang++-17
41+
clang++-17 --version
4242
sudo apt-get install -y make cmake ccache ninja-build yasm gawk wget
4343
ccache -s
4444
- name: Update git
@@ -76,13 +76,13 @@ jobs:
7676
key: ${{ matrix.os }}
7777
max-size: 5G
7878
append-timestamp: true
79-
- name: remove old clang and link clang-15 to clang
79+
- name: remove old clang and link clang-17 to clang
8080
if: matrix.os == 'ubuntu-20.04'
8181
run: |
8282
sudo rm /usr/bin/clang
83-
sudo ln -s /usr/bin/clang-15 /usr/bin/clang
83+
sudo ln -s /usr/bin/clang-17 /usr/bin/clang
8484
sudo rm /usr/bin/clang++
85-
sudo ln -s /usr/bin/clang++-15 /usr/bin/clang++
85+
sudo ln -s /usr/bin/clang++-17 /usr/bin/clang++
8686
which clang++
8787
clang++ --version
8888
- name: Run chdb/build.sh
@@ -167,8 +167,8 @@ jobs:
167167
uname -a
168168
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
169169
brew update
170-
brew install git ccache ninja libtool gettext llvm@15 gcc binutils grep findutils zstd
171-
export PATH=$(brew --prefix llvm@15)/bin:$PATH
170+
brew install git ccache ninja libtool gettext llvm@17 gcc binutils grep findutils zstd
171+
export PATH=$(brew --prefix llvm@17)/bin:$PATH
172172
which clang++
173173
clang++ --version
174174
ccache -s
@@ -205,9 +205,9 @@ jobs:
205205
timeout-minutes: 300
206206
run: |
207207
python3 -m pip install pybind11
208-
export PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
209-
export CC=$(brew --prefix llvm@15)/bin/clang
210-
export CXX=$(brew --prefix llvm@15)/bin/clang++
208+
export PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
209+
export CC=$(brew --prefix llvm@17)/bin/clang
210+
export CXX=$(brew --prefix llvm@17)/bin/clang++
211211
bash gen_manifest.sh
212212
bash ./chdb/build.sh
213213
python3 -m pip install pandas pyarrow
@@ -227,15 +227,15 @@ jobs:
227227
ls -lh chdb
228228
df -h
229229
env:
230-
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@15)/bin/clang CXX=$(brew --prefix llvm@15)/bin/clang++"
230+
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@17)/bin/clang CXX=$(brew --prefix llvm@17)/bin/clang++"
231231
- name: Install dependencies for building wheels
232232
run: |
233233
python3 -m pip install -U pip tox pybind11 twine setuptools wheel>=0.40.0
234234
- name: Build wheels
235235
run: |
236-
export PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
237-
export CC=$(brew --prefix llvm@15)/bin/clang
238-
export CXX=$(brew --prefix llvm@15)/bin/clang++
236+
export PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
237+
export CC=$(brew --prefix llvm@17)/bin/clang
238+
export CXX=$(brew --prefix llvm@17)/bin/clang++
239239
make wheel
240240
- name: Fix wheel platform tag
241241
run: |
@@ -282,8 +282,8 @@ jobs:
282282
uname -a
283283
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
284284
brew update
285-
brew install git ccache ninja libtool gettext llvm@15 gcc binutils grep findutils zstd
286-
export PATH=$(brew --prefix llvm@15)/bin:$PATH
285+
brew install git ccache ninja libtool gettext llvm@17 gcc binutils grep findutils zstd
286+
export PATH=$(brew --prefix llvm@17)/bin:$PATH
287287
which clang++
288288
clang++ --version
289289
ccache -s
@@ -311,17 +311,17 @@ jobs:
311311
- name: Prepare chdb/build.sh
312312
run: |
313313
python3 -m pip install pybind11
314-
export PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
315-
export CC=$(brew --prefix llvm@15)/bin/clang
316-
export CXX=$(brew --prefix llvm@15)/bin/clang++
314+
export PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin
315+
export CC=$(brew --prefix llvm@17)/bin/clang
316+
export CXX=$(brew --prefix llvm@17)/bin/clang++
317317
continue-on-error: false
318318
- name: Check ccache statistics
319319
run: |
320320
ccache -s
321321
ls -lh chdb
322322
df -h
323323
env:
324-
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@15)/bin/clang CXX=$(brew --prefix llvm@15)/bin/clang++"
324+
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@17)/bin/clang CXX=$(brew --prefix llvm@17)/bin/clang++"
325325
- name: Remove /usr/local/bin/python3
326326
run: |
327327
sudo rm -f /usr/local/bin/python3
@@ -333,7 +333,7 @@ jobs:
333333
run: python3 -m cibuildwheel --output-dir wheelhouse
334334
timeout-minutes: 300
335335
env:
336-
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@15)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@15)/bin/clang CXX=$(brew --prefix llvm@15)/bin/clang++"
336+
CIBW_ENVIRONMENT_MACOS: "PATH=$(brew --prefix llvm@17)/bin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/binutils/bin:$PATH:/usr/local/opt/findutils/libexec/gnubin CC=$(brew --prefix llvm@17)/bin/clang CXX=$(brew --prefix llvm@17)/bin/clang++"
337337
CIBW_DEBUG: 1
338338
CIBW_BEFORE_BUILD: "pip install -U pip tox pybind11 && bash -x gen_manifest.sh && bash chdb/build.sh"
339339
CIBW_BUILD_VERBOSITY: 3

‎chdb/build_mac_arm64.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ if [ ! -d ${PROJ_DIR}/python_pkg ]; then
1818
mkdir ${PROJ_DIR}/python_pkg
1919
fi
2020

21-
# prefer /usr/local/opt/llvm@15/bin/clang++ then /usr/local/opt/llvm/bin/clang++
22-
if [ -f /usr/local/opt/llvm@15/bin/clang++ ]; then
23-
export CXX=/usr/local/opt/llvm@15/bin/clang++
21+
# prefer /usr/local/opt/llvm@17/bin/clang++ then /usr/local/opt/llvm/bin/clang++
22+
if [ -f /usr/local/opt/llvm@17/bin/clang++ ]; then
23+
export CXX=/usr/local/opt/llvm@17/bin/clang++
2424
elif [ -f /usr/local/opt/llvm/bin/clang++ ]; then
2525
export CXX=/usr/local/opt/llvm/bin/clang++
2626
fi
27-
if [ -f /usr/local/opt/llvm@15/bin/clang ]; then
28-
export CC=/usr/local/opt/llvm@15/bin/clang
27+
if [ -f /usr/local/opt/llvm@17/bin/clang ]; then
28+
export CC=/usr/local/opt/llvm@17/bin/clang
2929
elif [ -f /usr/local/opt/llvm/bin/clang ]; then
3030
export CC=/usr/local/opt/llvm/bin/clang
3131
fi

0 commit comments

Comments
 (0)