Commit fbd96907c9f53f01c211e6e3bbf15e53aaeb79f0 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-05-21 20:24:13+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-05-21 20:24:13+02:00
log	fbd96907c9f53f01c211e6e3bbf15e53aaeb79f0
tree	1ec06e6689a76031e6a39ee330c04bfc031809fc
parent	4b69bd61e41f1a49bb0b00ac00a7e499ab7974a7

wasm: build static archive unless -dynamic specified

This matches the behaviour for other targets in that

```
zig build-lib math.zig -target wasm32-freestanding
```

produces now `libmath.a` while

```
zig build-lib math.zig -dynamic -target wasm32-freestanding
```

is required to create a loadable Wasm module.

3 files changed, 20 insertions(+), 8 deletions(-)

doc
- docgen.zig
- langref.html.in
src
- main.zig

doc/docgen.zig+17

 @@ -284,6 +284,7 @@ const Code = struct {
     link_objects: []const []const u8,
     target_str: ?[]const u8,
     link_libc: bool,
+    link_mode: ?std.builtin.LinkMode,
     disable_cache: bool,
     const Id = union(enum) {
 @@ -533,6 +534,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
                     defer link_objects.deinit();
                     var target_str: ?[]const u8 = null;
                     var link_libc = false;
+                    var link_mode: ?std.builtin.LinkMode = null;
                     var disable_cache = false;
                     const source_token = while (true) {
 @@ -562,6 +564,8 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
                             target_str = "wasm32-wasi";
                         } else if (mem.eql(u8, end_tag_name, "link_libc")) {
                             link_libc = true;
+                        } else if (mem.eql(u8, end_tag_name, "link_mode_dynamic")) {
+                            link_mode = .Dynamic;
                         } else if (mem.eql(u8, end_tag_name, "code_end")) {
                             _ = try eatToken(tokenizer, Token.Id.BracketClose);
                             break content_tok;
 @@ -585,6 +589,7 @@ fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
                             .link_objects = link_objects.toOwnedSlice(),
                             .target_str = target_str,
                             .link_libc = link_libc,
+                            .link_mode = link_mode,
                             .disable_cache = disable_cache,
                         },
                     });
 @@ -1468,6 +1473,18 @@ fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: any
                             try test_args.appendSlice(&[_][]const u8{ "-target", triple });
                             try out.print(" -target {s}", .{triple});
                         }
+                        if (code.link_mode) |link_mode| {
+                            switch (link_mode) {
+                                .Static => {
+                                    try test_args.append("-static");
+                                    try out.print(" -static", .{});
+                                },
+                                .Dynamic => {
+                                    try test_args.append("-dynamic");
+                                    try out.print(" -dynamic", .{});
+                                },
+                            }
+                        }
                         const result = exec(allocator, &env_map, test_args.items) catch return parseError(tokenizer, code.source_token, "test failed", .{});
                         const escaped_stderr = try escapeHtml(allocator, result.stderr);
                         const escaped_stdout = try escapeHtml(allocator, result.stdout);

doc/langref.html.in+3-2

 @@ -10036,10 +10036,11 @@ all your base are belong to us</code></pre>
       {#header_open|WebAssembly#}
       <p>Zig supports building for WebAssembly out of the box.</p>
       {#header_open|Freestanding#}
-      <p>For host environments like the web browser and nodejs, build as a library using the freestanding OS target.
+      <p>For host environments like the web browser and nodejs, build as a dynamic library using the freestanding
-      Here's an example of running Zig code compiled to WebAssembly with nodejs.</p>
+      OS target. Here's an example of running Zig code compiled to WebAssembly with nodejs.</p>
       {#code_begin|lib|math#}
       {#target_wasm#}
+      {#link_mode_dynamic#}
 extern fn print(i32) void;
 export fn add(a: i32, b: i32) void {

src/main.zig-6

...	@@ -1548,12 +1548,6 @@ fn buildOutputType(	...	@@ -1548,12 +1548,6 @@ fn buildOutputType(
1548	link_libcpp = true;	1548	link_libcpp = true;
1549	}	1549	}
1550		1550
1551	if (cross_target.getCpuArch().isWasm() and output_mode == .Lib and link_mode == null) {
1552	// If link_mode is unspecified, always link as dynamic library when targeting Wasm,
1553	// so that wasm-ld is invoked rather than standard archiver.
1554	link_mode = .Dynamic;
1555	}
1556
1557	// Now that we have target info, we can find out if any of the system libraries	1551	// Now that we have target info, we can find out if any of the system libraries
1558	// are part of libc or libc++. We remove them from the list and communicate their	1552	// are part of libc or libc++. We remove them from the list and communicate their
1559	// existence via flags instead.	1553	// existence via flags instead.