Commit 7cd2c1ce8770ccd3bb5a9d9c79baf4d0013ab0c8 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2024-12-09 10:46:56+01:00
committer	GitHub <noreply@github.com> 2024-12-09 10:46:56+01:00
log	7cd2c1ce8770ccd3bb5a9d9c79baf4d0013ab0c8
tree	54d5a06f7c71e3e8c2d2564c21d022752467fb63
parent	589f4e91708366ddff9ee6793d5f88b05a260959
parent	c9e74bb9aa6d17993e3c8e922963601a00b405bc
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #22191 from alexrp/wasi-libc-names

`std.zig.target`: Teach `isLibCLibName()` about emulated wasi-libc libraries

2 files changed, 21 insertions(+), 8 deletions(-)

lib
- std
  - zig
    target.zig
src
- main.zig

lib/std/zig/target.zig+11-2

 @@ -218,13 +218,22 @@ pub fn isLibCLibName(target: std.Target, name: []const u8) bool {
             return true;
         if (eqlIgnoreCase(ignore_case, name, "xnet"))
             return true;
+        if (target.os.tag == .wasi) {
+            if (eqlIgnoreCase(ignore_case, name, "wasi-emulated-getpid"))
+                return true;
+            if (eqlIgnoreCase(ignore_case, name, "wasi-emulated-mman"))
+                return true;
+            if (eqlIgnoreCase(ignore_case, name, "wasi-emulated-process-clocks"))
+                return true;
+            if (eqlIgnoreCase(ignore_case, name, "wasi-emulated-signal"))
+                return true;
+        }
     }
     if (target.os.tag.isDarwin()) {
         if (eqlIgnoreCase(ignore_case, name, "System"))
             return true;
-        if (eqlIgnoreCase(ignore_case, name, "c"))
-            return true;
         if (eqlIgnoreCase(ignore_case, name, "dbm"))
             return true;
         if (eqlIgnoreCase(ignore_case, name, "dl"))

src/main.zig+10-6

 @@ -3824,6 +3824,15 @@ fn createModule(
         for (create_module.cli_link_inputs.items) |cli_link_input| switch (cli_link_input) {
             .name_query => |nq| {
                 const lib_name = nq.name;
+                if (target.os.tag == .wasi) {
+                    if (wasi_libc.getEmulatedLibCrtFile(lib_name)) |crt_file| {
+                        try create_module.wasi_emulated_libs.append(arena, crt_file);
+                        create_module.opts.link_libc = true;
+                        continue;
+                    }
+                }
                 if (std.zig.target.isLibCLibName(target, lib_name)) {
                     create_module.opts.link_libc = true;
                     continue;
 @@ -3832,6 +3841,7 @@ fn createModule(
                     create_module.opts.link_libcpp = true;
                     continue;
                 }
                 switch (target_util.classifyCompilerRtLibName(lib_name)) {
                     .none => {},
                     .only_libunwind, .both => {
 @@ -3857,12 +3867,6 @@ fn createModule(
                     fatal("cannot use absolute path as a system library: {s}", .{lib_name});
                 }
-                if (target.os.tag == .wasi) {
-                    if (wasi_libc.getEmulatedLibCrtFile(lib_name)) |crt_file| {
-                        try create_module.wasi_emulated_libs.append(arena, crt_file);
-                        continue;
-                    }
-                }
                 unresolved_link_inputs.appendAssumeCapacity(cli_link_input);
                 any_name_queries_remaining = true;
             },