From 6c15d6966071cf4252343411bad5b60709a7d23f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 18 Sep 2024 13:09:37 -0700 Subject: [PATCH] Revert "ci: Build with `ZIG2_NO_RTLIB` on Windows machines." This reverts commit 7e66b6d0684fb1b3aa76381486e655e4d13bc0a5. I don't think this is needed, I don't get any errors locally when I bootstrap windows without this change. --- ci/aarch64-windows.ps1 | 3 +-- ci/x86_64-windows-debug.ps1 | 3 +-- ci/x86_64-windows-release.ps1 | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/ci/aarch64-windows.ps1 b/ci/aarch64-windows.ps1 index 4923f351d4..5a8ea205ed 100644 --- a/ci/aarch64-windows.ps1 +++ b/ci/aarch64-windows.ps1 @@ -55,8 +55,7 @@ $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 ` - -DZIG2_NO_RTLIB=ON + -DZIG_NO_LIB=ON CheckLastExitCode ninja install diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 86bc70ede9..b6395d087d 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -55,8 +55,7 @@ $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 ` - -DZIG2_NO_RTLIB=ON + -DZIG_NO_LIB=ON CheckLastExitCode ninja install diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 271d5435ee..f517325cd0 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -55,8 +55,7 @@ $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 ` - -DZIG2_NO_RTLIB=ON + -DZIG_NO_LIB=ON CheckLastExitCode ninja install