authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-06-26 10:50:28-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-06-29 23:50:20-07:00
log7004ceff01b952567313546f368d70781cf5dbb4
tree2464f1f12f7a9ed6810275298c6562a21698a466
parent2554d416dfe2d5bf1df4de256b7c761ba464984d

ci: don't set zig lib dir for zig cc

1 files changed, 4 insertions(+), 1 deletions(-)

ci/x86_64-linux-release.sh+4-1
...@@ -48,7 +48,7 @@ unset CXX...@@ -48,7 +48,7 @@ unset CXX
4848
49ninja install49ninja install
5050
51# Must be done after zig cc is finished.51# Must not be set while using the other `zig cc` which has its own zig lib dir.
52export ZIG_LIB_DIR="$PWD/../lib"52export ZIG_LIB_DIR="$PWD/../lib"
5353
54# Covers several things:54# Covers several things:
...@@ -99,6 +99,7 @@ cd ../build-new...@@ -99,6 +99,7 @@ cd ../build-new
9999
100export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"100export CC="$ZIG cc -target $TARGET -mcpu=$MCPU"
101export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"101export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU"
102unset ZIG_LIB_DIR
102103
103cmake .. \104cmake .. \
104 -DCMAKE_PREFIX_PATH="$PREFIX" \105 -DCMAKE_PREFIX_PATH="$PREFIX" \
...@@ -117,6 +118,8 @@ unset CXX...@@ -117,6 +118,8 @@ unset CXX
117118
118ninja install119ninja install
119120
121export ZIG_LIB_DIR="$PWD/../lib"
122
120stage3/bin/zig test ../test/behavior.zig123stage3/bin/zig test ../test/behavior.zig
121stage3/bin/zig build -p stage4 \124stage3/bin/zig build -p stage4 \
122 -Dstatic-llvm \125 -Dstatic-llvm \