Skip to content

Commit 3dc087d

Browse files
committed
Fix Windows compilation with clang version >= 17
1 parent 41caff6 commit 3dc087d

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

.github/workflows/build.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
shell: bash
2323
run: |
2424
if [[ "${{ runner.os }}" == "Windows" ]] ; then
25-
choco install llvm
2625
choco install zip
2726
elif [[ "${{ runner.os }}" == "macOS" ]] ; then
2827
brew install coreutils
@@ -47,6 +46,11 @@ jobs:
4746
run: python3 tools/git-sync-deps
4847
- name: Fetch Ninja
4948
run: python3 bin/fetch-ninja
49+
- name: Install LLVM and Clang 18
50+
if: runner.os == 'Windows'
51+
uses: KyleMayes/install-llvm-action@v2
52+
with:
53+
version: "18.1.3"
5054
- name: Generating Ninja Files
5155
shell: bash
5256
run: |
@@ -58,7 +62,8 @@ jobs:
5862
export is_official=true
5963
fi
6064
if [[ "${{ runner.os }}" == "Windows" ]] ; then
61-
export gn_flags='is_trivial_abi=false win_vc="C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC" win_toolchain_version="17.9" win_sdk="C:\\Program Files\\Windows Kits\\10" win_sdk_version="10.0.22621.0" cc="clang" cxx="clang++" clang_win="C:\Program Files\LLVM" clang_win_version="16.0.0"'
65+
clang++ --version
66+
export gn_flags='is_trivial_abi=false win_vc="C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC" win_toolchain_version="17.10" win_sdk="C:\\Program Files\\Windows Kits\\10" win_sdk_version="10.0.22621.0" cc="clang" cxx="clang++" clang_win="C:\Program Files\LLVM" clang_win_version="18.1.3"'
6267
if [[ "${{ matrix.mode }}" == "Debug" ]] ; then
6368
export gn_flags="$gn_flags extra_cflags=[\"-MTd\"]"
6469
else

0 commit comments

Comments
 (0)