| author |  Alex Rønne Petersen <alex@alexrp.com> 2025-11-28 22:57:33+01:00 |
| committer | Alex Rønne Petersen <alex@alexrp.com> 2025-11-28 22:57:33+01:00 |
| log | a38220376e4734e07cbcc897ef74182649844658 |
| tree | 520fa3b47c9b8e222a8b9366f9980d8bc27dec72 |
| parent | a8f9b5dc0695bd0fb54d35f75c66175cc6ee87a8 |
| signature |  Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM |
Revert "ci: apply workaround for #22213 to x86_64-linux scripts"
This reverts commit a8f9b5dc0695bd0fb54d35f75c66175cc6ee87a8.3 files changed, 4 insertions(+), 16 deletions(-)
ci/x86_64-linux-debug-llvm.sh+1-4
| ... | ... | @@ -34,10 +34,7 @@ cmake .. \ |
| 34 | 34 | -DZIG_STATIC=ON \ |
| 35 | 35 | -DZIG_NO_LIB=ON \ |
| 36 | 36 | -DZIG_EXTRA_BUILD_ARGS="-Duse-llvm=true" \ |
| 37 | -GNinja \ | |
| 38 | -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ | |
| 39 | -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE | |
| 40 | # https://github.com/ziglang/zig/issues/22213 | |
| 37 | -GNinja | |
| 41 | 38 | |
| 42 | 39 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
| 43 | 40 | # so that installation and testing do not get affected by them. |
ci/x86_64-linux-debug.sh+1-4
| ... | ... | @@ -33,10 +33,7 @@ cmake .. \ |
| 33 | 33 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 34 | 34 | -DZIG_STATIC=ON \ |
| 35 | 35 | -DZIG_NO_LIB=ON \ |
| 36 | -GNinja \ | |
| 37 | -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ | |
| 38 | -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE | |
| 39 | # https://github.com/ziglang/zig/issues/22213 | |
| 36 | -GNinja | |
| 40 | 37 | |
| 41 | 38 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
| 42 | 39 | # so that installation and testing do not get affected by them. |
ci/x86_64-linux-release.sh+2-8
| ... | ... | @@ -39,10 +39,7 @@ cmake .. \ |
| 39 | 39 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 40 | 40 | -DZIG_STATIC=ON \ |
| 41 | 41 | -DZIG_NO_LIB=ON \ |
| 42 | -GNinja \ | |
| 43 | -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ | |
| 44 | -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE | |
| 45 | # https://github.com/ziglang/zig/issues/22213 | |
| 42 | -GNinja | |
| 46 | 43 | |
| 47 | 44 | # Now cmake will use zig as the C/C++ compiler. We reset the environment variables |
| 48 | 45 | # so that installation and testing do not get affected by them. |
| ... | ... | @@ -100,10 +97,7 @@ cmake .. \ |
| 100 | 97 | -DZIG_TARGET_MCPU="$MCPU" \ |
| 101 | 98 | -DZIG_STATIC=ON \ |
| 102 | 99 | -DZIG_NO_LIB=ON \ |
| 103 | -GNinja \ | |
| 104 | -DCMAKE_C_LINKER_DEPFILE_SUPPORTED=FALSE \ | |
| 105 | -DCMAKE_CXX_LINKER_DEPFILE_SUPPORTED=FALSE | |
| 106 | # https://github.com/ziglang/zig/issues/22213 | |
| 100 | -GNinja | |
| 107 | 101 | |
| 108 | 102 | unset CC |
| 109 | 103 | unset CXX |