diff options
| author | Frank Denis <124872+jedisct1@users.noreply.github.com> | 2023-02-20 17:15:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 16:15:21 +0000 |
| commit | 5a7d80a5e7d0aaafc6ed3017e0e4342dcd476a51 (patch) | |
| tree | 59520b6ab55547d2c7fedf575ce948db13bbcb3d /src/main.zig | |
| parent | 99c11cc8cfb285b713284f7af0c7359508e0a660 (diff) | |
| download | zig-5a7d80a5e7d0aaafc6ed3017e0e4342dcd476a51.tar.gz zig-5a7d80a5e7d0aaafc6ed3017e0e4342dcd476a51.zip | |
Linker: -z<arg> should be equivalent to -z <arg> (#14680)
lld accepts both syntaxes, but we were rejecting (and, before
3f7e9ff597a3514bb1c4f1900027c40682ac9f13, ignoring) the former.
In particular, "cargo-zigbuild" was broken since Rust
unconditionally adds "-znoexecstack" (not "-z noexecstack")
on non-Windows platforms.
Co-authored-by: Andrew Kelley <andrew@ziglang.org>
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/main.zig b/src/main.zig index e80be06a36..e42974944b 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1955,12 +1955,15 @@ fn buildOutputType( linker_compress_debug_sections = std.meta.stringToEnum(link.CompressDebugSections, arg1) orelse { fatal("expected [none|zlib] after --compress-debug-sections, found '{s}'", .{arg1}); }; - } else if (mem.eql(u8, arg, "-z")) { - i += 1; - if (i >= linker_args.items.len) { - fatal("expected linker extension flag after '{s}'", .{arg}); + } else if (mem.startsWith(u8, arg, "-z")) { + var z_arg = arg[2..]; + if (z_arg.len == 0) { + i += 1; + if (i >= linker_args.items.len) { + fatal("expected linker extension flag after '{s}'", .{arg}); + } + z_arg = linker_args.items[i]; } - const z_arg = linker_args.items[i]; if (mem.eql(u8, z_arg, "nodelete")) { linker_z_nodelete = true; } else if (mem.eql(u8, z_arg, "notext")) { |