From cffe1999c695c60d2c61c0781a1e16edaa2263f3 Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Mon, 15 Apr 2024 01:28:48 -0700
Subject: [PATCH] windows_argv standalone test: Only test against MSVC if it's
 available

---
 test/standalone/windows_argv/build.zig | 70 +++++++++++++++-----------
 1 file changed, 41 insertions(+), 29 deletions(-)

diff --git a/test/standalone/windows_argv/build.zig b/test/standalone/windows_argv/build.zig
index dcc2d1e4b1..93af6dc719 100644
--- a/test/standalone/windows_argv/build.zig
+++ b/test/standalone/windows_argv/build.zig
@@ -9,28 +9,6 @@ pub fn build(b: *std.Build) !void {
 
     const optimize: std.builtin.OptimizeMode = .Debug;
 
-    const lib_msvc = b.addStaticLibrary(.{
-        .name = "toargv-msvc",
-        .root_source_file = .{ .path = "lib.zig" },
-        .target = b.resolveTargetQuery(.{
-            .abi = .msvc,
-        }),
-        .optimize = optimize,
-    });
-    const verify_msvc = b.addExecutable(.{
-        .name = "verify-msvc",
-        .target = b.resolveTargetQuery(.{
-            .abi = .msvc,
-        }),
-        .optimize = optimize,
-    });
-    verify_msvc.addCSourceFile(.{
-        .file = .{ .path = "verify.c" },
-        .flags = &.{ "-DUNICODE", "-D_UNICODE" },
-    });
-    verify_msvc.linkLibrary(lib_msvc);
-    verify_msvc.linkLibC();
-
     const lib_gnu = b.addStaticLibrary(.{
         .name = "toargv-gnu",
         .root_source_file = .{ .path = "lib.zig" },
@@ -71,18 +49,52 @@ pub fn build(b: *std.Build) !void {
     };
     const fuzz_seed_arg = std.fmt.allocPrint(b.allocator, "{}", .{fuzz_seed}) catch @panic("oom");
 
-    const run_msvc = b.addRunArtifact(fuzz);
-    run_msvc.setName("fuzz-msvc");
-    run_msvc.addArtifactArg(verify_msvc);
-    run_msvc.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
-    run_msvc.expectExitCode(0);
-
     const run_gnu = b.addRunArtifact(fuzz);
     run_gnu.setName("fuzz-gnu");
     run_gnu.addArtifactArg(verify_gnu);
     run_gnu.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
     run_gnu.expectExitCode(0);
 
-    test_step.dependOn(&run_msvc.step);
     test_step.dependOn(&run_gnu.step);
+
+    // Only target the MSVC ABI if MSVC/Windows SDK is available
+    const has_msvc = has_msvc: {
+        const sdk = std.zig.WindowsSdk.find(b.allocator) catch |err| switch (err) {
+            error.OutOfMemory => @panic("oom"),
+            else => break :has_msvc false,
+        };
+        defer sdk.free(b.allocator);
+        break :has_msvc true;
+    };
+    if (has_msvc) {
+        const lib_msvc = b.addStaticLibrary(.{
+            .name = "toargv-msvc",
+            .root_source_file = .{ .path = "lib.zig" },
+            .target = b.resolveTargetQuery(.{
+                .abi = .msvc,
+            }),
+            .optimize = optimize,
+        });
+        const verify_msvc = b.addExecutable(.{
+            .name = "verify-msvc",
+            .target = b.resolveTargetQuery(.{
+                .abi = .msvc,
+            }),
+            .optimize = optimize,
+        });
+        verify_msvc.addCSourceFile(.{
+            .file = .{ .path = "verify.c" },
+            .flags = &.{ "-DUNICODE", "-D_UNICODE" },
+        });
+        verify_msvc.linkLibrary(lib_msvc);
+        verify_msvc.linkLibC();
+
+        const run_msvc = b.addRunArtifact(fuzz);
+        run_msvc.setName("fuzz-msvc");
+        run_msvc.addArtifactArg(verify_msvc);
+        run_msvc.addArgs(&.{ fuzz_iterations_arg, fuzz_seed_arg });
+        run_msvc.expectExitCode(0);
+
+        test_step.dependOn(&run_msvc.step);
+    }
 }