Skip to content

Commit a079ac6

Browse files
Fix mac clang version
1 parent 2088665 commit a079ac6

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

.github/workflows/main.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,29 @@ jobs:
438438
export HOMEBREW_NO_AUTO_UPDATE=1
439439
brew install cmake googletest wabt llvm
440440
echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH
441+
- name: Determine clang compiler
442+
run: |
443+
set -ex
444+
# Check if Xcode clang is available first, otherwise use Homebrew LLVM clang
445+
if [ -x "/usr/bin/clang" ] && [ -x "/usr/bin/clang++" ]; then
446+
echo "Using Xcode clang"
447+
echo "CLANG_CC=/usr/bin/clang" >> $GITHUB_ENV
448+
echo "CLANG_CXX=/usr/bin/clang++" >> $GITHUB_ENV
449+
else
450+
echo "Xcode clang not found, using Homebrew LLVM clang"
451+
echo "CLANG_CC=clang" >> $GITHUB_ENV
452+
echo "CLANG_CXX=clang++" >> $GITHUB_ENV
453+
fi
441454
- name: Build and test
442455
run: |
443456
set -ex
444457
mkdir build
445458
cd build
446-
cmake .. -DVB_ENABLE_DEV_FEATURE=OFF -DENABLE_CLANG_TIDY=1 -DENABLE_WERROR=1 -DENABLE_SPECTEST=1 -DTEST_VARIANTS=1 -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_UNITTEST=1 -DENABLE_DIS=1
459+
cmake .. -DVB_ENABLE_DEV_FEATURE=OFF -DENABLE_CLANG_TIDY=1 -DENABLE_WERROR=1 -DENABLE_SPECTEST=1 -DTEST_VARIANTS=1 -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_CXX_COMPILER=$CLANG_CXX -DCMAKE_C_COMPILER=$CLANG_CC -DENABLE_UNITTEST=1 -DENABLE_DIS=1
447460
make -j $(sysctl -n hw.physicalcpu)
448461
make test
449462
rm -rf *
450-
cmake .. -DVB_ENABLE_DEV_FEATURE=OFF -DENABLE_WERROR=1 -DENABLE_SPECTEST=1 -DTEST_VARIANTS=1 -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DENABLE_UNITTEST=1
463+
cmake .. -DVB_ENABLE_DEV_FEATURE=OFF -DENABLE_WERROR=1 -DENABLE_SPECTEST=1 -DTEST_VARIANTS=1 -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_CXX_COMPILER=$CLANG_CXX -DCMAKE_C_COMPILER=$CLANG_CC -DENABLE_UNITTEST=1
451464
make -j $(sysctl -n hw.physicalcpu)
452465
make test
453466

0 commit comments

Comments
 (0)