From 42ca9e5d8e45264ae39ac9dd7fd34e2d9f82a61a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 5 Jan 2026 11:15:31 -0800 Subject: [PATCH] std.Build: remove no longer needed workaround now that definitions of networking addresses are arch-independent --- lib/std/Build/Step.zig | 7 +------ lib/std/Io/Threaded.zig | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/std/Build/Step.zig b/lib/std/Build/Step.zig index 007765c4d57b58814d87a88d7b33c8f2e0efb40a..ec931306cd86e102deb3ce477045fdfeb78d0f18 100644 --- a/lib/std/Build/Step.zig +++ b/lib/std/Build/Step.zig @@ -111,12 +111,7 @@ pub const TestResults = struct { pub const MakeOptions = struct { progress_node: std.Progress.Node, watch: bool, - web_server: switch (builtin.target.cpu.arch) { - else => ?*Build.WebServer, - // WASM code references `Build.abi` which happens to incidentally reference this type, but - // it currently breaks because `std.net.Address` doesn't work there. Work around for now. - .wasm32 => void, - }, + web_server: ?*Build.WebServer, /// If set, this is a timeout to enforce on all individual unit tests, in nanoseconds. unit_test_timeout_ns: ?u64, /// Not to be confused with `Build.allocator`, which is an alias of `Build.graph.arena`. diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig index 53c85622d6065ec5ab8bba90a403bd7dc58f0f03..8d976f121df82717fce0f80c9a532a9f73ddb279 100644 --- a/lib/std/Io/Threaded.zig +++ b/lib/std/Io/Threaded.zig @@ -65,7 +65,7 @@ argv0: Argv0, environ: Environ, null_file: NullFile = .{}, -dev_urandom_fd: dev_urandom_fd_t, +dev_urandom_fd: dev_urandom_fd_t = if (use_dev_urandom) -1 else {}, pub const Argv0 = switch (native_os) { .openbsd, .haiku => struct { -- 2.54.0