Commit a680c7ba982cfc98df6f9cb0e5e06f2839c706c3 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-04-15 00:41:30-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-04-15 00:41:30-07:00
log	a680c7ba982cfc98df6f9cb0e5e06f2839c706c3
tree	103821694671bc9f10ad33645be702209af7618a
parent	c59241bda00376b5a6ee20ca52358329b7482f7f

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

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

ci
- azure
  - windows_script

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	pip install s3cmd
10	10
11	11	ZIGDIR="$(pwd)"
12		CACHE_BASENAME="zig+llvm+lld+clang-x86_64-windows-gnu-0.8.0-dev.1939+5a3ea9bec"
	12	CACHE_BASENAME="zig+llvm+lld+clang-x86_64-windows-gnu-0.8.0-dev.1951+c59241bda"
13	13	PREFIX="$HOME/$CACHE_BASENAME"
14		ZIG="$PREFIX/bin/zig"
	14	ZIG="$PREFIX/bin/zig.exe"
15	15
16	16	cd "$HOME"
17	17	wget -nv "https://ziglang.org/deps/$CACHE_BASENAME.tar.xz"
...	...	@@ -35,6 +35,8 @@ cmake .. -DCMAKE_BUILD_TYPE=Release \
35	35	"-DCMAKE_INSTALL_PREFIX=$(pwd)/dist" \
36	36	-DCMAKE_CROSSCOMPILING=True \
37	37	-DCMAKE_SYSTEM_NAME="Windows" \
	38	-DCMAKE_AR="$PREFIX/bin/llvm-ar.exe" \
	39	-DCMAKE_RANLIB="$PREFIX/bin/llvm-ar.exe" \
38	40	-DZIG_OMIT_STAGE2=ON \
39	41	-DZIG_STATIC=ON \
40	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	57	ninja install
56	58
57	59
58		dist/bin/zig build test-behavior -Dskip-non-native
	60	dist/bin/zig.exe build test-behavior -Dskip-non-native
59	61	# Disabled to prevent OOM
60	62	# dist/bin/zig build test-stage2
61		dist/bin/zig build test-fmt -Dskip-non-native
62		dist/bin/zig build test-std -Dskip-non-native
63		dist/bin/zig build test-compiler-rt -Dskip-non-native
64		dist/bin/zig build test-compare-output -Dskip-non-native
65		dist/bin/zig build test-standalone -Dskip-non-native
66		dist/bin/zig build test-stack-traces -Dskip-non-native
67		dist/bin/zig build test-cli -Dskip-non-native
68		dist/bin/zig build test-asm-link -Dskip-non-native
69		dist/bin/zig build test-runtime-safety -Dskip-non-native
70		dist/bin/zig build test-translate-c -Dskip-non-native
71		dist/bin/zig build test-run-translated-c -Dskip-non-native
72		dist/bin/zig build docs
	63	dist/bin/zig.exe build test-fmt -Dskip-non-native
	64	dist/bin/zig.exe build test-std -Dskip-non-native
	65	dist/bin/zig.exe build test-compiler-rt -Dskip-non-native
	66	dist/bin/zig.exe build test-compare-output -Dskip-non-native
	67	dist/bin/zig.exe build test-standalone -Dskip-non-native
	68	dist/bin/zig.exe build test-stack-traces -Dskip-non-native
	69	dist/bin/zig.exe build test-cli -Dskip-non-native
	70	dist/bin/zig.exe build test-asm-link -Dskip-non-native
	71	dist/bin/zig.exe build test-runtime-safety -Dskip-non-native
	72	dist/bin/zig.exe build test-translate-c -Dskip-non-native
	73	dist/bin/zig.exe build test-run-translated-c -Dskip-non-native
	74	dist/bin/zig.exe build docs
73	75
74	76	if [ "${BUILD_REASON}" != "PullRequest" ]; then
75	77	cd "$ZIGDIR/build"