motiejus/zig
1
Fork 0
Code Releases Activity

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

Browse Source 
cc,wasi: ship WASI libc and autobuild it when needed
This commit is contained in:
Jakub Konka
2021-05-21 09:04:16 +02:00
committed by GitHub
parent 0267abfe9b b63c92f0b9
commit 4b69bd61e4
2439 changed files with 125821 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/std/target.zig
View File

@@ -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",

9
lib/std/zig.zig
View File

@@ -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}),