Commit 47f132b7705f4ded6d671c1f5abe0b9003e57e44 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2026-09-09 14:08:15+02:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2026-09-09 18:22:16+02:00
log	47f132b7705f4ded6d671c1f5abe0b9003e57e44
tree	6cd1219fb5459fc39a4b2ee91cb38af6e3b05b68
parent	b877cf3fe54c93117400aaf9ff72d92133b42c03
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

ci: use CMAKE_{C,CXX}_COMPILER instead of the CC/CXX env dance

25 files changed, 52 insertions(+), 205 deletions(-)

ci/aarch64-freebsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-freebsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-linux-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-netbsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-netbsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-openbsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/aarch64-openbsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/loongarch64-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/loongarch64-linux-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/powerpc64le-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/powerpc64le-linux-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/riscv64-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/riscv64-linux-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/s390x-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/s390x-linux-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-freebsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-freebsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-linux-debug-llvm.sh+2-8

...	...	@@ -22,13 +22,12 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug-llvm
23	23	cd build-debug-llvm
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
...	...	@@ -36,11 +35,6 @@ cmake .. \
36	35	-DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \
37	36	-GNinja
38	37
39		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
40		# so that installation and testing do not get affected by them.
41		unset CC
42		unset CXX
43
44	38	ninja install
45	39
46	40	# Must be done after zig cc is finished.

ci/x86_64-linux-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-linux-release.sh+4-13

...	...	@@ -28,24 +28,18 @@ cc -o bootstrap bootstrap.c
28	28	mkdir -p build-release
29	29	cd build-release
30	30
31		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
32		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
33
34	31	cmake .. \
35	32	-DCMAKE_INSTALL_PREFIX="stage3-release" \
36	33	-DCMAKE_PREFIX_PATH="$PREFIX" \
37	34	-DCMAKE_BUILD_TYPE=Release \
	35	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	36	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
38	37	-DZIG_TARGET_TRIPLE="$TARGET" \
39	38	-DZIG_TARGET_MCPU="$MCPU" \
40	39	-DZIG_STATIC=ON \
41	40	-DZIG_NO_LIB=ON \
42	41	-GNinja
43	42
44		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
45		# so that installation and testing do not get affected by them.
46		unset CC
47		unset CXX
48
49	43	ninja install
50	44
51	45	# Must not be set while using the other `zig cc` which has its own zig lib dir.
...	...	@@ -98,22 +92,19 @@ stage3-release/bin/zig build update-zig1
98	92	mkdir -p ../build-new
99	93	cd ../build-new
100	94
101		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
102		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
103	95	unset ZIG_LIB_DIR
104	96
105	97	cmake .. \
106	98	-DCMAKE_PREFIX_PATH="$PREFIX" \
107	99	-DCMAKE_BUILD_TYPE=Release \
	100	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	101	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
108	102	-DZIG_TARGET_TRIPLE="$TARGET" \
109	103	-DZIG_TARGET_MCPU="$MCPU" \
110	104	-DZIG_STATIC=ON \
111	105	-DZIG_NO_LIB=ON \
112	106	-GNinja
113	107
114		unset CC
115		unset CXX
116
117	108	ninja install
118	109
119	110	export ZIG_LIB_DIR="$PWD/../lib"

ci/x86_64-netbsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-netbsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-openbsd-debug.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-debug
23	23	cd build-debug
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-debug" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Debug \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.

ci/x86_64-openbsd-release.sh+2-8

...	...	@@ -22,24 +22,18 @@ export ZIG_LOCAL_CACHE_DIR="$PWD/zig-local-cache"
22	22	mkdir -p build-release
23	23	cd build-release
24	24
25		export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
26		export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
27
28	25	cmake .. \
29	26	-DCMAKE_INSTALL_PREFIX="stage3-release" \
30	27	-DCMAKE_PREFIX_PATH="$PREFIX" \
31	28	-DCMAKE_BUILD_TYPE=Release \
	29	-DCMAKE_C_COMPILER="$ZIG;cc;-target;$TARGET;-mcpu=$MCPU" \
	30	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
32	31	-DZIG_TARGET_TRIPLE="$TARGET" \
33	32	-DZIG_TARGET_MCPU="$MCPU" \
34	33	-DZIG_STATIC=ON \
35	34	-DZIG_NO_LIB=ON \
36	35	-GNinja
37	36
38		# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
39		# so that installation and testing do not get affected by them.
40		unset CC
41		unset CXX
42
43	37	ninja install
44	38
45	39	# Must be done after zig cc is finished.