authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-28 22:06:46+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-28 22:06:46+01:00
loga8f9b5dc0695bd0fb54d35f75c66175cc6ee87a8
tree53c99b662c2c4e437214a46236cc909f36cf0e1f
parent713716770ebe7ae1b55cfbe40478b149aac152fb
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

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

3 files changed, 16 insertions(+), 4 deletions(-)

ci/x86_64-linux-debug-llvm.sh+4-1
...@@ -34,7 +34,10 @@ cmake .. \...@@ -34,7 +34,10 @@ cmake .. \
34 -DZIG_STATIC=ON \34 -DZIG_STATIC=ON \
35 -DZIG_NO_LIB=ON \35 -DZIG_NO_LIB=ON \
36 -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \36 -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \
37 -GNinja37 -GNinja \
38 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
39 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
40# https://github.com/ziglang/zig/issues/22213
3841
39# Now cmake will use zig as the C/C++ compiler. We reset the environment variables42# 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.43# so that installation and testing do not get affected by them.
ci/x86_64-linux-debug.sh+4-1
...@@ -33,7 +33,10 @@ cmake .. \...@@ -33,7 +33,10 @@ cmake .. \
33 -DZIG_TARGET_MCPU="$MCPU" \33 -DZIG_TARGET_MCPU="$MCPU" \
34 -DZIG_STATIC=ON \34 -DZIG_STATIC=ON \
35 -DZIG_NO_LIB=ON \35 -DZIG_NO_LIB=ON \
36 -GNinja36 -GNinja \
37 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
38 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
39# https://github.com/ziglang/zig/issues/22213
3740
38# Now cmake will use zig as the C/C++ compiler. We reset the environment variables41# 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.42# so that installation and testing do not get affected by them.
ci/x86_64-linux-release.sh+8-2
...@@ -39,7 +39,10 @@ cmake .. \...@@ -39,7 +39,10 @@ cmake .. \
39 -DZIG_TARGET_MCPU="$MCPU" \39 -DZIG_TARGET_MCPU="$MCPU" \
40 -DZIG_STATIC=ON \40 -DZIG_STATIC=ON \
41 -DZIG_NO_LIB=ON \41 -DZIG_NO_LIB=ON \
42 -GNinja42 -GNinja \
43 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
44 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
45# https://github.com/ziglang/zig/issues/22213
4346
44# Now cmake will use zig as the C/C++ compiler. We reset the environment variables47# 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.48# so that installation and testing do not get affected by them.
...@@ -97,7 +100,10 @@ cmake .. \...@@ -97,7 +100,10 @@ cmake .. \
97 -DZIG_TARGET_MCPU="$MCPU" \100 -DZIG_TARGET_MCPU="$MCPU" \
98 -DZIG_STATIC=ON \101 -DZIG_STATIC=ON \
99 -DZIG_NO_LIB=ON \102 -DZIG_NO_LIB=ON \
100 -GNinja103 -GNinja \
104 -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \
105 -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE
106# https://github.com/ziglang/zig/issues/22213
101107
102unset CC108unset CC
103unset CXX109unset CXX