From 2b72c0d30473d020583b967fc8b494335f4fe75c Mon Sep 17 00:00:00 2001 From: kcbanner Date: Sat, 28 Mar 2026 02:23:14 -0400 Subject: [PATCH] - Fixup `producesCompilerRtDynLib` conditions - Fixup skipping the new float varags test on .stage2_llvm --- lib/std/Build/Step/Compile.zig | 4 +++- test/behavior/var_args.zig | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig index a1987e56332c0052540c3430cb33d9dac7b02655..529b58a0ddef567008141338e97d555f60fb2374 100644 --- a/lib/std/Build/Step/Compile.zig +++ b/lib/std/Build/Step/Compile.zig @@ -696,7 +696,9 @@ pub fn producesPdbFile(compile: *Compile) bool { pub fn producesCompilerRtDynLib(compile: *Compile) bool { if (compile.rootModuleTarget().ofmt != .coff) return false; - return compile.use_llvm == false; + if (compile.bundle_compiler_rt orelse (compile.kind == .exe or compile.isDynamicLibrary())) + return compile.use_llvm == false; + return false; } pub fn producesImplib(compile: *Compile) bool { diff --git a/test/behavior/var_args.zig b/test/behavior/var_args.zig index a82e8046e5e7c20b39adfbee1d2629d5583446a7..1ad6d7ddc0360bc0c880fd6bd4005ed3b3bf6717 100644 --- a/test/behavior/var_args.zig +++ b/test/behavior/var_args.zig @@ -101,7 +101,7 @@ test "simple variadic function" { // https://github.com/ziglang/zig/issues/14096 return error.SkipZigTest; } - if (builtin.cpu.arch == .x86_64 and builtin.os.tag == .windows and builtin.zig_backend != .stage2_x86_64) return error.SkipZigTest; // TODO + if (builtin.cpu.arch == .x86_64 and builtin.os.tag == .windows and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // TODO if (builtin.cpu.arch == .s390x and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/21350 if (builtin.cpu.arch.isSPARC() and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/23718 if (builtin.cpu.arch.isRISCV() and builtin.zig_backend == .stage2_llvm) return error.SkipZigTest; // https://github.com/ziglang/zig/issues/25064 -- 2.54.0