Commit adf5af1bc5
Changed files (4)
ci/azure/linux_script
@@ -30,7 +30,7 @@ VERSION="$(./zig version)"
if [ "${BUILD_REASON}" != "PullRequest" ]; then
ARTIFACTSDIR="$BUILDDIR/artifacts"
mkdir "$ARTIFACTSDIR"
- docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64 -j2 $BUILD_SOURCEVERSION
+ docker run -i --mount type=bind,source="$ARTIFACTSDIR",target=/z ziglang/static-base:llvm10-x86_64-1 -j2 $BUILD_SOURCEVERSION
TARBALL="$(ls $ARTIFACTSDIR)"
mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"
s3cmd put -P --add-header="cache-control: public, max-age=31536000, immutable" "$ARTIFACTSDIR/$TARBALL" s3://ziglang.org/builds/
ci/azure/macos_script
@@ -5,20 +5,20 @@ set -e
system_profiler SPHardwareDataType
-brew install s3cmd gcc@8
+brew install s3cmd gcc@9
ZIGDIR="$(pwd)"
LLVMVER="10.0.0"
ARCH="x86_64"
-CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macos-gcc8-release"
+CACHE_BASENAME="llvm+clang+lld-$LLVMVER-$ARCH-macosx-gcc8-release"
PREFIX="$HOME/$CACHE_BASENAME"
TMPDIR="$HOME/tmpz"
JOBS="-j2"
# I tried using the system default compiler (clang), but it couldn't statically link libc++.
-# So we use gcc-8 from homebrew.
-export CC=gcc-8
-export CXX=g++-8
+# So we use gcc-9 from homebrew.
+export CC=gcc-9
+export CXX=g++-9
rm -rf $PREFIX
rm -rf $TMPDIR
@@ -55,18 +55,18 @@ else
make $JOBS install
cd $TMPDIR
- wget https://releases.llvm.org/$LLVMVER/cfe-$LLVMVER.src.tar.xz
- tar xf cfe-$LLVMVER.src.tar.xz
- cd cfe-$LLVMVER.src/
+ wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVMVER/lld-$LLVMVER.src.tar.xz
+ tar xf lld-$LLVMVER.src.tar.xz
+ cd lld-$LLVMVER.src/
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release
make $JOBS install
cd $TMPDIR
- wget https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVMVER/lld-$LLVMVER.src.tar.xz
- tar xf lld-$LLVMVER.src.tar.xz
- cd lld-$LLVMVER.src/
+ wget https://releases.llvm.org/$LLVMVER/clang-$LLVMVER.src.tar.xz
+ tar xf clang-$LLVMVER.src.tar.xz
+ cd clang-$LLVMVER.src/
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX -DCMAKE_BUILD_TYPE=Release
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%2blld-10.0.0-x86_64-windows-msvc-mt.tar.xz"
-tar xf llvm+clang-10.0.0-win64-msvc-release.tar.xz
+wget -nv "https://ziglang.org/deps/llvm%2bclang%2blld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz"
+tar xf llvm+clang+lld-10.0.0-x86_64-windows-msvc-release-mt.tar.xz
ci/srht/freebsd_script
@@ -7,12 +7,12 @@ sudo pkg update -fq
sudo pkg install -y cmake py27-s3cmd wget curl jq
ZIGDIR="$(pwd)"
-CACHE_BASENAME="llvm+clang-10.0.0-freebsd-x86_64-release"
+CACHE_BASENAME="llvm+clang+lld-10.0.0-x86_64-freebsd-release"
PREFIX="$HOME/$CACHE_BASENAME"
JOBS="-j$(sysctl -n hw.ncpu)"
cd $HOME
-wget -nv "https://ziglang.org/builds/$CACHE_BASENAME.tar.xz"
+wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
tar xf "$CACHE_BASENAME.tar.xz"
cd $ZIGDIR