diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index aa8ef2ab9f..3c11820352 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 3306b8676b..fb28044877 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 95d751be49..c7b3dc7e36 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. @@ -100,10 +97,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 unset CC unset CXX