From 335ed630a06d6f95ecc3c8be7548329407e1602e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Sun, 8 Sep 2024 01:37:21 +0200 Subject: [PATCH] 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. --- ci/aarch64-windows.ps1 | 3 ++- ci/x86_64-windows-debug.ps1 | 3 ++- ci/x86_64-windows-release.ps1 | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/aarch64-windows.ps1 b/ci/aarch64-windows.ps1 index dfff2c0f081fce6c4d3e56b57f4e894b34c114df..0686669c5004d8849a71bf2c685bb7f4700d6878 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 55a0960fd6c7add47823a2d8af8eb87540c62642..a88503b40e8dce04dd85805b1de1248a50f13a18 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 a2613ea7ddbbbdab98bcdaefaa70a045378d753a..a14391a128355289bd0c43c1d75b9624e363ad85 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 -- 2.54.0