diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-03-22 15:35:54 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-03-22 15:35:54 -0400 |
| commit | 8d1659bb39591e3a1814fa8d8d70c94e29979747 (patch) | |
| tree | b24e9c3b1d59572cc2f453f22b8d6dca118c27db /ci | |
| parent | adf5af1bc500ef0261e82b7286f16c46f9760dc7 (diff) | |
| download | zig-8d1659bb39591e3a1814fa8d8d70c94e29979747.tar.gz zig-8d1659bb39591e3a1814fa8d8d70c94e29979747.zip | |
ci: again fix the cache tarball URLs
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/azure/linux_script | 2 | ||||
| -rwxr-xr-x | ci/azure/macos_script | 2 | ||||
| -rw-r--r-- | ci/azure/windows_script.bat | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/azure/linux_script b/ci/azure/linux_script index 144d1de735..ece4ff9766 100755 --- a/ci/azure/linux_script +++ b/ci/azure/linux_script @@ -12,7 +12,7 @@ sudo apt-get update -q sudo apt-get remove -y llvm-* sudo rm -rf /usr/local/* -sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev cmake s3cmd gcc-7 g++-7 qemu +sudo apt-get install -y libxml2-dev libclang-10-dev llvm-10 llvm-10-dev lld-10-dev cmake s3cmd gcc-7 g++-7 qemu # Make the `zig version` number consistent. # This will affect the cmake command below. diff --git a/ci/azure/macos_script b/ci/azure/macos_script index 20d4ad71bf..7dd4344e39 100755 --- a/ci/azure/macos_script +++ b/ci/azure/macos_script @@ -10,7 +10,7 @@ brew install s3cmd gcc@9 ZIGDIR="$(pwd)" LLVMVER="10.0.0" ARCH="x86_64" -CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc8-release" +CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc9-release" PREFIX="$HOME/$CACHE_BASENAME" TMPDIR="$HOME/tmpz" JOBS="-j2" diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat index d83d2075a1..a8ae902de4 100644 --- a/ci/azure/windows_script.bat +++ b/ci/azure/windows_script.bat @@ -11,7 +11,7 @@ SET "MSYSTEM=%PREVMSYSTEM%" SET "ZIGBUILDDIR=%SRCROOT%\build" SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist" -SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-10.0.0-x86_64-windows-msvc-mt" +SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 |