Skip to content

Commit 71cbe55

Browse files
committed
upd
1 parent ef6df82 commit 71cbe55

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/clang-cl-from-vs-arm64.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
4242
& "$vsInstaller" modify `
4343
--installPath "$vsPath" `
44-
--add Microsoft.VisualStudio.Component.VC.Tools.ARM64.Clang `
44+
--add Microsoft.VisualStudio.Component.VC.Llvm.Clang `
4545
--quiet --wait
4646
4747
- name: Build project
@@ -52,13 +52,11 @@ jobs:
5252
git config submodule.wsrep-lib.update none
5353
mkdir bld
5454
cd bld
55-
#set PATH=C:\LLVM\bin;%PATH%
55+
rem set PATH=C:\LLVM\bin;%PATH%
5656
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" arm64
57-
cmake .. -DWITH_SSL=bundled ^
58-
-DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl ^
59-
-DCMAKE_C_COMPILER_TARGET=arm64-windows-msvc -DCMAKE_CXX_COMPILER_TARGET=arm64-windows-msvc ^
60-
-DCMAKE_LINKER=lld-link -DCMAKE_SYSTEM_PROCESSOR=ARM64 ^
61-
-GNinja
57+
dir "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\ARM64\bin\clang-cl.exe"
58+
set CLANG_CL=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\ARM64\bin\clang-cl.exe
59+
cmake .. -GNinja -DWITH_SSL=bundled "-DCMAKE_C_COMPILER=%CLANG_CL%" "-DCMAKE_CXX_COMPILER=%CLANG_CL%" -DCMAKE_C_COMPILER_TARGET=arm64-windows-msvc -DCMAKE_CXX_COMPILER_TARGET=arm64-windows-msvc -DCMAKE_LINKER=lld-link -DCMAKE_SYSTEM_PROCESSOR=ARM64
6260
cmake --build . --parallel --verbose
6361
cmake --build . --target win_package_zip
6462
shell: cmd

0 commit comments

Comments
 (0)