authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-15 00:41:30-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-15 00:41:30-07:00
loga680c7ba982cfc98df6f9cb0e5e06f2839c706c3
tree103821694671bc9f10ad33645be702209af7618a
parentc59241bda00376b5a6ee20ca52358329b7482f7f

ci: windows: use llvm-ar.exe from the tarball

1 files changed, 17 insertions(+), 15 deletions(-)

ci/azure/windows_script+17-15
...@@ -9,9 +9,9 @@ pacman -S --needed --noconfirm cmake git ninja wget p7zip python3-pip tar xz...@@ -9,9 +9,9 @@ pacman -S --needed --noconfirm cmake git ninja wget p7zip python3-pip tar xz
9pip install s3cmd9pip install s3cmd
1010
11ZIGDIR="$(pwd)"11ZIGDIR="$(pwd)"
12CACHE_BASENAME="zig+llvm+lld+clang-x86_64-windows-gnu-0.8.0-dev.1939+5a3ea9bec"12CACHE_BASENAME="zig+llvm+lld+clang-x86_64-windows-gnu-0.8.0-dev.1951+c59241bda"
13PREFIX="$HOME/$CACHE_BASENAME"13PREFIX="$HOME/$CACHE_BASENAME"
14ZIG="$PREFIX/bin/zig"14ZIG="$PREFIX/bin/zig.exe"
1515
16cd "$HOME"16cd "$HOME"
17wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"17wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
...@@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \...@@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \
35 "-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \35 "-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \
36 -DCMAKE_CROSSCOMPILING=True \36 -DCMAKE_CROSSCOMPILING=True \
37 -DCMAKE_SYSTEM_NAME="Windows" \37 -DCMAKE_SYSTEM_NAME="Windows" \
38 -DCMAKE_AR="$PREFIX/bin/llvm-ar.exe" \
39 -DCMAKE_RANLIB="$PREFIX/bin/llvm-ar.exe" \
38 -DZIG_OMIT_STAGE2=ON \40 -DZIG_OMIT_STAGE2=ON \
39 -DZIG_STATIC=ON \41 -DZIG_STATIC=ON \
40 -DZIG_TARGET_TRIPLE="x86_64-windows-gnu" \42 -DZIG_TARGET_TRIPLE="x86_64-windows-gnu" \
...@@ -55,21 +57,21 @@ cmake .. -DZIG_EXECUTABLE="$(pwd)/dist/bin/zig.exe" -DZIG_TARGET_MCPU="x86_64_v2...@@ -55,21 +57,21 @@ cmake .. -DZIG_EXECUTABLE="$(pwd)/dist/bin/zig.exe" -DZIG_TARGET_MCPU="x86_64_v2
55ninja install57ninja install
5658
5759
58dist/bin/zig build test-behavior -Dskip-non-native60dist/bin/zig.exe build test-behavior -Dskip-non-native
59# Disabled to prevent OOM61# Disabled to prevent OOM
60# dist/bin/zig build test-stage262# dist/bin/zig build test-stage2
61dist/bin/zig build test-fmt -Dskip-non-native63dist/bin/zig.exe build test-fmt -Dskip-non-native
62dist/bin/zig build test-std -Dskip-non-native64dist/bin/zig.exe build test-std -Dskip-non-native
63dist/bin/zig build test-compiler-rt -Dskip-non-native65dist/bin/zig.exe build test-compiler-rt -Dskip-non-native
64dist/bin/zig build test-compare-output -Dskip-non-native66dist/bin/zig.exe build test-compare-output -Dskip-non-native
65dist/bin/zig build test-standalone -Dskip-non-native67dist/bin/zig.exe build test-standalone -Dskip-non-native
66dist/bin/zig build test-stack-traces -Dskip-non-native68dist/bin/zig.exe build test-stack-traces -Dskip-non-native
67dist/bin/zig build test-cli -Dskip-non-native69dist/bin/zig.exe build test-cli -Dskip-non-native
68dist/bin/zig build test-asm-link -Dskip-non-native70dist/bin/zig.exe build test-asm-link -Dskip-non-native
69dist/bin/zig build test-runtime-safety -Dskip-non-native71dist/bin/zig.exe build test-runtime-safety -Dskip-non-native
70dist/bin/zig build test-translate-c -Dskip-non-native72dist/bin/zig.exe build test-translate-c -Dskip-non-native
71dist/bin/zig build test-run-translated-c -Dskip-non-native73dist/bin/zig.exe build test-run-translated-c -Dskip-non-native
72dist/bin/zig build docs74dist/bin/zig.exe build docs
7375
74if [ "${BUILD_REASON}" != "PullRequest" ]; then76if [ "${BUILD_REASON}" != "PullRequest" ]; then
75 cd "$ZIGDIR/build"77 cd "$ZIGDIR/build"