diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index 0fbccca8d3291869b1d68e461417053524b2b109..64c6589fba220c76e25e9d80f950efc97f777df4 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -48,7 +48,7 @@ unset CXX ninja install -# Must be done after zig cc is finished. +# Must not be set while using the other `zig cc` which has its own zig lib dir. export ZIG_LIB_DIR="$PWD/../lib" # Covers several things: @@ -99,6 +99,7 @@ cd ../build-new export CC="$ZIG cc -target $TARGET -mcpu=$MCPU" export CXX="$ZIG c++ -target $TARGET -mcpu=$MCPU" +unset ZIG_LIB_DIR cmake .. \ -DCMAKE_PREFIX_PATH="$PREFIX" \ @@ -117,6 +118,8 @@ unset CXX ninja install +export ZIG_LIB_DIR="$PWD/../lib" + stage3/bin/zig test ../test/behavior.zig stage3/bin/zig build -p stage4 \ -Dstatic-llvm \