Revert "ci: apply workaround for #22213 to x86_64-linux scripts"

This reverts commit a8f9b5dc06.
This commit is contained in:
Alex Rønne Petersen 2025-11-28 22:57:33 +01:00
parent a8f9b5dc06
commit a38220376e
No known key found for this signature in database
3 changed files with 4 additions and 16 deletions

View file

@ -34,10 +34,7 @@ cmake .. \
-DZIG_STATIC=ON \ -DZIG_STATIC=ON \
-DZIG_NO_LIB=ON \ -DZIG_NO_LIB=ON \
-DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \ -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \
-GNinja \ -GNinja
-DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
# https://github.com/ziglang/zig/issues/22213
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables # Now cmake will use zig as the C/C++ compiler. We reset the environment variables
# so that installation and testing do not get affected by them. # so that installation and testing do not get affected by them.

View file

@ -33,10 +33,7 @@ cmake .. \
-DZIG_TARGET_MCPU="$MCPU" \ -DZIG_TARGET_MCPU="$MCPU" \
-DZIG_STATIC=ON \ -DZIG_STATIC=ON \
-DZIG_NO_LIB=ON \ -DZIG_NO_LIB=ON \
-GNinja \ -GNinja
-DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
# https://github.com/ziglang/zig/issues/22213
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables # Now cmake will use zig as the C/C++ compiler. We reset the environment variables
# so that installation and testing do not get affected by them. # so that installation and testing do not get affected by them.

View file

@ -39,10 +39,7 @@ cmake .. \
-DZIG_TARGET_MCPU="$MCPU" \ -DZIG_TARGET_MCPU="$MCPU" \
-DZIG_STATIC=ON \ -DZIG_STATIC=ON \
-DZIG_NO_LIB=ON \ -DZIG_NO_LIB=ON \
-GNinja \ -GNinja
-DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
# https://github.com/ziglang/zig/issues/22213
# Now cmake will use zig as the C/C++ compiler. We reset the environment variables # Now cmake will use zig as the C/C++ compiler. We reset the environment variables
# so that installation and testing do not get affected by them. # so that installation and testing do not get affected by them.
@ -100,10 +97,7 @@ cmake .. \
-DZIG_TARGET_MCPU="$MCPU" \ -DZIG_TARGET_MCPU="$MCPU" \
-DZIG_STATIC=ON \ -DZIG_STATIC=ON \
-DZIG_NO_LIB=ON \ -DZIG_NO_LIB=ON \
-GNinja \ -GNinja
-DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
-DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
# https://github.com/ziglang/zig/issues/22213
unset CC unset CC
unset CXX unset CXX