Skip to content

Commit e76454b

Browse files
committed
fix: set MACOS_CMAKE_ARGS for diff clang versions
1 parent 227e64e commit e76454b

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,19 @@ jobs:
8080
runs-on: ${{ matrix.runner }}
8181
if: ${{ github.actor != 'dependabot[bot]' }}
8282
env:
83-
COMMON_CMAKE_ARGS: '-DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"'
83+
COMMON_CMAKE_ARGS: >
84+
-DBUILD_SHARED_LIBS=OFF
85+
-DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"
8486
MACOS_CMAKE_ARGS: >
8587
-DCMAKE_BUILD_TYPE=MinSizeRel
8688
-DCMAKE_CXX_COMPILER=g++-11
8789
-DCMAKE_C_COMPILER=gcc-11
8890
-DZSTD_STATIC_LINKING_ONLY=1
8991
-DLLVM_ENABLE_ASSERTIONS=OFF
90-
LINUX_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10'
92+
LINUX_CMAKE_ARGS: >
93+
-DCMAKE_BUILD_TYPE=MinSizeRel
94+
-DCMAKE_CXX_COMPILER=g++-10
95+
-DCMAKE_C_COMPILER=gcc-10
9196
RELEASE: '${{ matrix.release }}'
9297
suffix: '${{ matrix.clang-version }}_${{ matrix.os }}-amd64'
9398
steps:
@@ -149,6 +154,9 @@ jobs:
149154
brew update
150155
brew upgrade
151156
brew cleanup
157+
echo "Append DYLIB options..."
158+
MACOS_CMAKE_ARGS="$MACOS_CMAKE_ARGS -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON"
159+
echo "MACOS_CMAKE_ARGS=$MACOS_CMAKE_ARGS" >> $GITHUB_ENV
152160
- name: CMake
153161
run: cmake -S ${{ matrix.release }}/llvm -B ${{ matrix.release }}/build ${{ env.COMMON_CMAKE_ARGS }} ${{ matrix.os-cmake-args }} ${{ matrix.extra-cmake-args }}
154162
- name: Build

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
venv
2+
.venv

0 commit comments

Comments
 (0)