@@ -80,17 +80,24 @@ jobs:
80
80
runs-on : ${{ matrix.runner }}
81
81
if : ${{ github.actor != 'dependabot[bot]' }}
82
82
env :
83
- COMMON_CMAKE_ARGS : ' -DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"'
84
- MACOS_CMAKE_ARGS : >
83
+ COMMON_CMAKE_ARGS : >
84
+ -DBUILD_SHARED_LIBS=OFF
85
+ -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra"
86
+ LINUX_CMAKE_ARGS : >
85
87
-DCMAKE_BUILD_TYPE=MinSizeRel
86
- -DCMAKE_CXX_COMPILER=g++-11
87
- -DCMAKE_C_COMPILER=gcc-11
88
- -DZSTD_STATIC_LINKING_ONLY=1
89
- -DLLVM_ENABLE_ASSERTIONS=OFF
90
- LINUX_CMAKE_ARGS : ' -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-10 -DCMAKE_C_COMPILER=gcc-10'
88
+ -DCMAKE_CXX_COMPILER=g++-10
89
+ -DCMAKE_C_COMPILER=gcc-10
91
90
RELEASE : ' ${{ matrix.release }}'
92
91
suffix : ' ${{ matrix.clang-version }}_${{ matrix.os }}-amd64'
93
92
steps :
93
+ - name : Set MACOS_CMAKE_ARGS
94
+ if : ${{ matrix.os == 'macosx' }}
95
+ run : |
96
+ if [ "${{ matrix.clang-version }}" -gt 18 ]; then
97
+ echo "MACOS_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DZSTD_STATIC_LINKING_ONLY=1 -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_LINK_LLVM_DYLIB=ON -DLLVM_BUILD_LLVM_DYLIB=ON -DCLANG_LINK_CLANG_DYLIB=ON" >> $GITHUB_ENV
98
+ else
99
+ echo "MACOS_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_CXX_COMPILER=g++-11 -DCMAKE_C_COMPILER=gcc-11 -DZSTD_STATIC_LINKING_ONLY=1 -DLLVM_ENABLE_ASSERTIONS=OFF" >> $GITHUB_ENV
100
+ fi
94
101
- name : Download patches
95
102
# We download a tarball of this repo, as the presence of a .git directory leaks
96
103
# The commit hash of this repository into the clang binaries
0 commit comments