File tree Expand file tree Collapse file tree 3 files changed +11
-6
lines changed Expand file tree Collapse file tree 3 files changed +11
-6
lines changed Original file line number Diff line number Diff line change 2525 echo on
2626 cd ..
2727 set PATH=C:\Program Files\LLVM\bin;%CD%\ninja;%PATH%
28- call "%VSINSTALLDIR%Common7\Tools\VsDevCmd .bat" -arch= %ARCH%
28+ call "%VSINSTALLDIR%VC\Auxiliary\Build\vcvarsall .bat" %ARCH%
2929 echo on
3030 cmake --version
3131 ninja --version
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ language: cpp
55
66env :
77 global :
8- - CLANG_VERSION : 14.0.0
8+ - CLANG_VERSION : 14.0.3
99 # no MLIR, it increases compile times dangerously for 50 min timeout
1010 - LLVM_PROJECTS_TO_ENABLE : ' "bolt;compiler-rt;lld"'
1111 # keep these in sync with azure-pipelines.yml for Linux x64:
@@ -33,7 +33,7 @@ script:
3333 - nproc
3434 - free
3535 # Install a more recent version of CMake
36- - curl --max-time 300 --retry 3 -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.21.3 /cmake-3.21.3 -linux-aarch64.tar.gz
36+ - curl --max-time 300 --retry 3 -L -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.23.1 /cmake-3.23.1 -linux-aarch64.tar.gz
3737 - mkdir cmake_bin
3838 - tar -xf cmake.tar.gz --strip 1 -C cmake_bin
3939 - export PATH="$PWD/cmake_bin/bin:$PATH"
@@ -44,6 +44,8 @@ script:
4444 - rm clang.tar.xz
4545 - export CC="$PWD/clang_bin/bin/clang"
4646 - export CXX="$PWD/clang_bin/bin/clang++"
47+ # Make lld the default linker
48+ - sudo ln -sf "$PWD/clang_bin/bin/ld.lld" /usr/bin/ld
4749 # Build & install LLVM incl. LLD, compiler-rt, BOLT and the Khronos SPIRV-LLVM-Translator
4850 - cmake --version
4951 - ninja --version
Original file line number Diff line number Diff line change 11variables :
22 # Version of clang host compiler.
3- CLANG_VERSION : 14.0.0
3+ CLANG_VERSION : 14.0.3
44 LLVM_PROJECTS_TO_ENABLE : bolt;compiler-rt;lld;mlir
55 LLVM_TARGETS_TO_BUILD : all
66 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD : ' '
1717- job : Windows
1818 timeoutInMinutes : 240
1919 pool :
20- vmImage : ' windows-2019 '
20+ vmImage : ' windows-2022 '
2121 variables :
22- VSINSTALLDIR : C:\Program Files (x86) \Microsoft Visual Studio\2019 \Enterprise\
22+ VSINSTALLDIR : C:\Program Files\Microsoft Visual Studio\2022 \Enterprise\
2323 # compile errors with MLIR v13.0.0; exclude BOLT (not supported on Windows yet I guess)
2424 LLVM_PROJECTS_TO_ENABLE : compiler-rt;lld
2525 EXTRA_CMAKE_FLAGS : -DLLVM_USE_CRT_RELEASE=MT
5858 variables :
5959 CI_OS : linux
6060 ARCH : x86_64
61+ CLANG_VERSION : 14.0.0 # no prebuilt patch versions available
6162 # To improve portability of the generated binaries, link the C++ standard library statically.
6263 EXTRA_CMAKE_FLAGS : -DLLVM_BINUTILS_INCDIR=/usr/include -DLLVM_STATIC_LINK_CXX_STDLIB=ON
6364 strategy :
8586 set +x
8687 echo "##vso[task.setvariable variable=CC]$PWD/clang/bin/clang"
8788 echo "##vso[task.setvariable variable=CXX]$PWD/clang/bin/clang++"
89+ # Make lld the default linker
90+ sudo ln -sf "$PWD/clang/bin/ld.lld" /usr/bin/ld
8891 displayName: Install prerequisites
8992 - template : .azure-pipelines/posix.yml
9093
You can’t perform that action at this time.
0 commit comments