diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fac06502..ebd8efe5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,7 +11,7 @@ jobs: variables: VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\ # NB: update windows/build_lld.sha256sums as well - LLVM_VER: 9.0.0 + LLVM_VER: 14.0.0 ARCH: x86 steps: - template: .azure-pipelines/build-lld.yml @@ -24,7 +24,7 @@ jobs: variables: VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\ # NB: update windows/build_lld.sha256sums as well - LLVM_VER: 9.0.0 + LLVM_VER: 14.0.0 ARCH: x64 steps: - template: .azure-pipelines/build-lld.yml diff --git a/windows/build_lld.bat b/windows/build_lld.bat index f6506e75..9592c360 100644 --- a/windows/build_lld.bat +++ b/windows/build_lld.bat @@ -16,7 +16,10 @@ call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" %ARCH% cd %ROOT% @echo on -set LLVM_URL=http://releases.llvm.org/%LLVM_VER% + +:: LLVM releases are now done with github so need to match https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.0/lld-14.0.0.src.tar.xz + +set LLVM_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM_VER% powershell -Command "Invoke-WebRequest %LLVM_URL%/lld-%LLVM_VER%.src.tar.xz -OutFile lld.src.tar.xz" || exit /B 1 powershell -Command "Invoke-WebRequest %LLVM_URL%/llvm-%LLVM_VER%.src.tar.xz -OutFile llvm.src.tar.xz" || exit /B 1 @@ -24,11 +27,11 @@ powershell -Command "Invoke-WebRequest %LLVM_URL%/llvm-%LLVM_VER%.src.tar.xz -Ou dos2unix "%ROOT%\windows\build_lld.sha256sums" sha256sum -c "%ROOT%\windows\build_lld.sha256sums" || exit /B 1 -7z x "llvm.src.tar.xz" || exit /B 1 -7z x "lld.src.tar.xz" || exit /B 1 +7z x "llvm.src.tar.xz" -y || exit /B 1 +7z x "lld.src.tar.xz" -y || exit /B 1 -7z x "llvm.src.tar" || exit /B 1 -7z x "lld.src.tar" || exit /B 1 +7z x "llvm.src.tar" -y || exit /B 1 +7z x "lld.src.tar" -y || exit /B 1 move "llvm-%LLVM_VER%.src" llvm move "lld-%LLVM_VER%.src" llvm\tools\lld @@ -37,6 +40,8 @@ rem patch lld to not emit "No structured exception handler" sed -e s/IMAGE_DLL_CHARACTERISTICS_NO_SEH/0/ llvm\tools\lld\COFF\Writer.cpp >Writer.tmp move /Y Writer.tmp llvm\tools\lld\COFF\Writer.cpp +choco install visualstudio2019-workload-nativedesktop + set CMAKE_OPT=%CMAKE_OPT% -DCMAKE_CXX_FLAGS="/DIMAGE_DLL_CHARACTERISTICS_NO_SEH=0" set lld_build_dir=build-lld diff --git a/windows/build_lld.sha256sums b/windows/build_lld.sha256sums index f9f9c161..b0554329 100644 --- a/windows/build_lld.sha256sums +++ b/windows/build_lld.sha256sums @@ -1,2 +1,2 @@ -31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91 lld.src.tar.xz -d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84 llvm.src.tar.xz +88fc0f028aa8c0d9287920b101f288b03c7fabb584077326c5a0be482eb9115c lld.src.tar.xz +4df7ed50b8b7017b90dc22202f6b59e9006a29a9568238c6af28df9c049c7b9b llvm.src.tar.xz