From c03dc6665f55bbb16a62a74eae6b258863ac0a05 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 16 Oct 2019 19:08:41 -0400 Subject: [PATCH] update CI script for windows static builds --- ci/azure/windows_install | 4 ++-- ci/azure/windows_script.bat | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci/azure/windows_install b/ci/azure/windows_install index 390467e55..f0e02caa8 100755 --- a/ci/azure/windows_install +++ b/ci/azure/windows_install @@ -6,5 +6,5 @@ set -e pacman -Su --needed --noconfirm pacman -S --needed --noconfirm wget p7zip python3-pip pip install s3cmd -wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-release.tar.xz" -tar xf llvm+clang-9.0.0-win64-msvc-release.tar.xz +wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-mt.tar.xz" +tar xf llvm+clang-9.0.0-win64-msvc-mt.tar.xz diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat index 57140e19b..160d3c63b 100644 --- a/ci/azure/windows_script.bat +++ b/ci/azure/windows_script.bat @@ -11,15 +11,14 @@ SET "MSYSTEM=%PREVMSYSTEM%" SET "ZIGBUILDDIR=%SRCROOT%\build" SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" -SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release" +SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-mt" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 mkdir %ZIGBUILDDIR% cd %ZIGBUILDDIR% -REM Here we use MinSizeRel instead of Release to work around https://github.com/ziglang/zig/issues/3024 -cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=MinSizeRel || exit /b -msbuild /maxcpucount /p:Configuration=MinSizeRel INSTALL.vcxproj || exit /b +cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release -DZIG_FORCE_EXTERNAL_LLD=ON || exit /b +msbuild /maxcpucount /p:Configuration=Release INSTALL.vcxproj || exit /b "%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b