Merge pull request #8837 from ziglang/cc-wasm32-wasi

cc,wasi: ship WASI libc and autobuild it when needed

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/std/target.zig b/lib/std/target.zig
index fb54d2e18f..aa65ca669e 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -1307,9 +1307,6 @@ pub const Target = struct {
     }
 
     pub fn libPrefix_cpu_arch_abi(cpu_arch: Cpu.Arch, abi: Abi) [:0]const u8 {
-        if (cpu_arch.isWasm()) {
-            return "";
-        }
         switch (abi) {
             .msvc => return "",
             else => return "lib",
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index 911edbd21c..083803e0c8 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -160,8 +160,15 @@ pub fn binNameAlloc(allocator: *std.mem.Allocator, options: BinNameOptions) erro
         },
         .wasm => switch (options.output_mode) {
             .Exe => return std.fmt.allocPrint(allocator, "{s}{s}", .{ root_name, target.exeFileExt() }),
+            .Lib => {
+                switch (options.link_mode orelse .Static) {
+                    .Static => return std.fmt.allocPrint(allocator, "{s}{s}.a", .{
+                        target.libPrefix(), root_name,
+                    }),
+                    .Dynamic => return std.fmt.allocPrint(allocator, "{s}.wasm", .{root_name}),
+                }
+            },
             .Obj => return std.fmt.allocPrint(allocator, "{s}{s}", .{ root_name, target.oFileExt() }),
-            .Lib => return std.fmt.allocPrint(allocator, "{s}.wasm", .{root_name}),
         },
         .c => return std.fmt.allocPrint(allocator, "{s}.c", .{root_name}),
         .spirv => return std.fmt.allocPrint(allocator, "{s}.spv", .{root_name}),