aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Rønne Petersen <alex@alexrp.com>2024-09-08 01:37:21 +0200
committerAndrew Kelley <andrew@ziglang.org>2024-09-19 18:20:21 -0700
commit335ed630a06d6f95ecc3c8be7548329407e1602e (patch)
tree444e4e25808392b7049f5362e298868dda2e9b8e
parent3dd6456c0f8d50801d366062bcf5894bb5d9e7ac (diff)
downloadzig-335ed630a06d6f95ecc3c8be7548329407e1602e.tar.gz
zig-335ed630a06d6f95ecc3c8be7548329407e1602e.zip
ci: Build with `ZIG2_NO_RTLIB` on Windows machines.
Windows does not really have weak symbols. So when we bootstrap with `zig cc` and link both Zig's compiler-rt and the CBE's `compiler_rt.c` we end up with duplicate symbol errors at link time.
-rw-r--r--ci/aarch64-windows.ps13
-rw-r--r--ci/x86_64-windows-debug.ps13
-rw-r--r--ci/x86_64-windows-release.ps13
3 files changed, 6 insertions, 3 deletions
diff --git a/ci/aarch64-windows.ps1 b/ci/aarch64-windows.ps1
index dfff2c0f08..0686669c50 100644
--- a/ci/aarch64-windows.ps1
+++ b/ci/aarch64-windows.ps1
@@ -55,7 +55,8 @@ $Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
-DZIG_TARGET_TRIPLE="$TARGET" `
-DZIG_TARGET_MCPU="$MCPU" `
-DZIG_STATIC=ON `
- -DZIG_NO_LIB=ON
+ -DZIG_NO_LIB=ON `
+ -DZIG2_NO_RTLIB=ON
CheckLastExitCode
ninja install
diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1
index 55a0960fd6..a88503b40e 100644
--- a/ci/x86_64-windows-debug.ps1
+++ b/ci/x86_64-windows-debug.ps1
@@ -55,7 +55,8 @@ $Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
-DZIG_TARGET_TRIPLE="$TARGET" `
-DZIG_TARGET_MCPU="$MCPU" `
-DZIG_STATIC=ON `
- -DZIG_NO_LIB=ON
+ -DZIG_NO_LIB=ON `
+ -DZIG2_NO_RTLIB=ON
CheckLastExitCode
ninja install
diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1
index a2613ea7dd..a14391a128 100644
--- a/ci/x86_64-windows-release.ps1
+++ b/ci/x86_64-windows-release.ps1
@@ -55,7 +55,8 @@ $Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
-DZIG_TARGET_TRIPLE="$TARGET" `
-DZIG_TARGET_MCPU="$MCPU" `
-DZIG_STATIC=ON `
- -DZIG_NO_LIB=ON
+ -DZIG_NO_LIB=ON `
+ -DZIG2_NO_RTLIB=ON
CheckLastExitCode
ninja install