diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2021-06-09 01:23:05 +0200 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2021-06-09 01:25:38 +0200 |
| commit | 2ee1f7898b27447bb9b21d284842415c7459db4b (patch) | |
| tree | 1e22f27275c7c6ee6928ddd3a7c90f4b66d12ee6 /src/main.zig | |
| parent | dd84ccda5daf63373b2b5df3ac02025017b7efbf (diff) | |
| download | zig-2ee1f7898b27447bb9b21d284842415c7459db4b.tar.gz zig-2ee1f7898b27447bb9b21d284842415c7459db4b.zip | |
cc,wasi: store CRTFile enum in wasi_emulated_libs
* then, in `link/Wasm.zig` map `CRTFile` to full emulated libs name
* move logic for removing any mention of WASI snapshot
`wasi_snapshot_preview1` from `Compilation.zig` into `link/Wasm.zig`
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.zig b/src/main.zig index 1e4ec0183f..0b93f97726 100644 --- a/src/main.zig +++ b/src/main.zig @@ -617,7 +617,7 @@ fn buildOutputType( var system_libs = std.ArrayList([]const u8).init(gpa); defer system_libs.deinit(); - var wasi_emulated_libs = std.ArrayList([]const u8).init(gpa); + var wasi_emulated_libs = std.ArrayList(wasi_libc.CRTFile).init(gpa); defer wasi_emulated_libs.deinit(); var clang_argv = std.ArrayList([]const u8).init(gpa); @@ -1591,8 +1591,8 @@ fn buildOutputType( fatal("cannot use absolute path as a system library: {s}", .{lib_name}); } if (target_info.target.os.tag == .wasi) { - if (wasi_libc.getEmulatedLibCRTFile(lib_name)) |_| { - try wasi_emulated_libs.append(lib_name); + if (wasi_libc.getEmulatedLibCRTFile(lib_name)) |crt_file| { + try wasi_emulated_libs.append(crt_file); _ = system_libs.orderedRemove(i); continue; } |