From 3dfcba86b856cfcf2aaef9e4ca636c7b2d2f9276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 19 May 2026 13:53:24 +0200 Subject: [PATCH] ci: remove workaround for https://github.com/ziglang/zig/issues/22213 --- ci/aarch64-freebsd-debug.sh | 5 +---- ci/aarch64-freebsd-release.sh | 5 +---- ci/aarch64-netbsd-debug.sh | 5 +---- ci/aarch64-netbsd-release.sh | 5 +---- ci/loongarch64-linux-debug.sh | 5 +---- ci/loongarch64-linux-release.sh | 5 +---- ci/powerpc64le-linux-debug.sh | 5 +---- ci/powerpc64le-linux-release.sh | 5 +---- ci/s390x-linux-debug.sh | 5 +---- ci/s390x-linux-release.sh | 5 +---- ci/x86_64-freebsd-debug.sh | 5 +---- ci/x86_64-freebsd-release.sh | 5 +---- ci/x86_64-linux-debug-llvm.sh | 5 +---- ci/x86_64-linux-debug.sh | 5 +---- ci/x86_64-linux-release.sh | 5 +---- ci/x86_64-netbsd-debug.sh | 5 +---- ci/x86_64-netbsd-release.sh | 5 +---- ci/x86_64-openbsd-debug.sh | 5 +---- ci/x86_64-openbsd-release.sh | 5 +---- 19 files changed, 19 insertions(+), 76 deletions(-) diff --git a/ci/aarch64-freebsd-debug.sh b/ci/aarch64-freebsd-debug.sh index ad852e4601..a4cdc95d92 100755 --- a/ci/aarch64-freebsd-debug.sh +++ b/ci/aarch64-freebsd-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/aarch64-freebsd-release.sh b/ci/aarch64-freebsd-release.sh index 3db9e9a21d..456919a851 100755 --- a/ci/aarch64-freebsd-release.sh +++ b/ci/aarch64-freebsd-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/aarch64-netbsd-debug.sh b/ci/aarch64-netbsd-debug.sh index 3445cd6526..1fedad9875 100755 --- a/ci/aarch64-netbsd-debug.sh +++ b/ci/aarch64-netbsd-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/aarch64-netbsd-release.sh b/ci/aarch64-netbsd-release.sh index e866720e30..cb7594b145 100755 --- a/ci/aarch64-netbsd-release.sh +++ b/ci/aarch64-netbsd-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/loongarch64-linux-debug.sh b/ci/loongarch64-linux-debug.sh index a31239d41a..f980744f8d 100755 --- a/ci/loongarch64-linux-debug.sh +++ b/ci/loongarch64-linux-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/loongarch64-linux-release.sh b/ci/loongarch64-linux-release.sh index 5163b07fde..bb7fdd1eb9 100755 --- a/ci/loongarch64-linux-release.sh +++ b/ci/loongarch64-linux-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/powerpc64le-linux-debug.sh b/ci/powerpc64le-linux-debug.sh index 5950a5cd8b..cbdfd9f48f 100755 --- a/ci/powerpc64le-linux-debug.sh +++ b/ci/powerpc64le-linux-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/powerpc64le-linux-release.sh b/ci/powerpc64le-linux-release.sh index 2b911a9aef..b1398bd630 100755 --- a/ci/powerpc64le-linux-release.sh +++ b/ci/powerpc64le-linux-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/s390x-linux-debug.sh b/ci/s390x-linux-debug.sh index c66717b460..f4d601ce4b 100755 --- a/ci/s390x-linux-debug.sh +++ b/ci/s390x-linux-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/s390x-linux-release.sh b/ci/s390x-linux-release.sh index ed050d8148..17f8cd3339 100755 --- a/ci/s390x-linux-release.sh +++ b/ci/s390x-linux-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh index 911bd9ecc1..ec8d0db1ad 100755 --- a/ci/x86_64-freebsd-debug.sh +++ b/ci/x86_64-freebsd-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh index 4c1fa43479..103fa5b3e0 100755 --- a/ci/x86_64-freebsd-release.sh +++ b/ci/x86_64-freebsd-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index 499cd57534..750243130a 100755 --- a/ci/x86_64-linux-debug-llvm.sh +++ b/ci/x86_64-linux-debug-llvm.sh @@ -34,10 +34,7 @@ cmake .. \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 682e40923d..e6d6c08353 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -33,10 +33,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index c69231ea63..9a614001fb 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -39,10 +39,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-netbsd-debug.sh b/ci/x86_64-netbsd-debug.sh index 5328d0ea77..3755131c6d 100755 --- a/ci/x86_64-netbsd-debug.sh +++ b/ci/x86_64-netbsd-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-netbsd-release.sh b/ci/x86_64-netbsd-release.sh index 7ffce5e4f2..c9157219b4 100755 --- a/ci/x86_64-netbsd-release.sh +++ b/ci/x86_64-netbsd-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-openbsd-debug.sh b/ci/x86_64-openbsd-debug.sh index fe4e6ade53..e85befacfb 100755 --- a/ci/x86_64-openbsd-debug.sh +++ b/ci/x86_64-openbsd-debug.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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. diff --git a/ci/x86_64-openbsd-release.sh b/ci/x86_64-openbsd-release.sh index 378e41addf..504c4a143b 100755 --- a/ci/x86_64-openbsd-release.sh +++ b/ci/x86_64-openbsd-release.sh @@ -31,10 +31,7 @@ cmake .. \ -DZIG_TARGET_MCPU="$MCPU" \ -DZIG_STATIC=ON \ -DZIG_NO_LIB=ON \ - -GNinja \ - -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ - -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE -# https://github.com/ziglang/zig/issues/22213 + -GNinja # 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.