Skip to content

Commit 3f2dc11

Browse files
committed
MacOS: use llvm20
1 parent 2ecb711 commit 3f2dc11

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,21 @@ jobs:
196196
shell: bash
197197
run: |
198198
brew install ispc
199-
#brew install llvm
200-
#export PATH="/usr/local/opt/llvm/bin:$PATH"
199+
200+
# We make conan believe we use apple-clang (see profiles), but
201+
# actually we use recent version of llvm, to get full compatibility
202+
# with C++20
203+
brew install llvm@20
204+
205+
LLVM_PREFIX=$(brew --prefix llvm@20)
206+
echo "PATH=$LLVM_PREFIX/bin:$PATH" >> $GITHUB_ENV
207+
echo "CC=clang" >> $GITHUB_ENV
208+
echo "CXX=clang++" >> $GITHUB_ENV
209+
echo "AR=llvm-ar" >> $GITHUB_ENV
210+
echo "RANLIB=llvm-ranlib" >> $GITHUB_ENV
211+
echo "LD=ld.lld" >> $GITHUB_ENV
212+
echo "DYLD_LIBRARY_PATH=$LLVM_PREFIX/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
213+
export PATH="/usr/local/opt/llvm/bin:$PATH"
201214
202215
bash ${{ env.WORKSPACE }}/install-conan.sh
203216

conan-profiles/conan-profile-macOS-X64

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ compiler.version=14.0
99
compiler.cppstd={{ os.getenv("CXX_VERSION") }}
1010
compiler.libcxx=libc++
1111

12+
spdlog/*:compiler=clang
13+
spdlog/*:compiler.version=20
14+
spdlog/*:compiler.cppstd={{ os.getenv("CXX_VERSION") }}
15+
spdlog/*:compiler.libcxx=libc++
16+
1217
[options]
1318
minizip-ng/*:with_zlib=True
1419
minizip-ng/*:with_libcomp=False

0 commit comments

Comments
 (0)