authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-29 16:16:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-29 16:18:44-07:00
log66b4bd19c08963b750f6b186739d4ac9402fd896
treeed6772536113d9175355a7f2529bad27710dada2
parent2cdffc97f062feb898f4c8268f1ec6e252077e96

CLI: clarify help text for -z


1 files changed, 5 insertions(+), 5 deletions(-)

src/main.zig+5-5
......@@ -401,7 +401,7 @@ const usage_build_generic =
401401 \\ -fno-allow-shlib-undefined Disallows undefined symbols in shared libraries
402402 \\ --eh-frame-hdr Enable C++ exception handling by passing --eh-frame-hdr to linker
403403 \\ --emit-relocs Enable output of relocation sections for post build tools
404 \\ -z [arg] Append linker arguments
404 \\ -z [arg] Set linker extension flags
405405 \\ nodelete Indicate that the object cannot be deleted from a process
406406 \\ notext Permit read-only relocations in read-only segments
407407 \\ defs Force a fatal error if any undefined symbols remain
......@@ -1098,7 +1098,7 @@ fn buildOutputType(
10981098 } else if (mem.eql(u8, arg, "-z")) {
10991099 i += 1;
11001100 if (i >= args.len) {
1101 fatal("expected linker arg after '{s}'", .{arg});
1101 fatal("expected linker extension flag after '{s}'", .{arg});
11021102 }
11031103 const z_arg = args[i];
11041104 if (mem.eql(u8, z_arg, "nodelete")) {
......@@ -1116,7 +1116,7 @@ fn buildOutputType(
11161116 } else if (mem.eql(u8, z_arg, "relro")) {
11171117 linker_z_relro = true;
11181118 } else {
1119 warn("unsupported linker arg: -z {s}", .{z_arg});
1119 warn("unsupported linker extension flag: -z {s}", .{z_arg});
11201120 }
11211121 } else if (mem.eql(u8, arg, "-Bsymbolic")) {
11221122 linker_bind_global_refs_locally = true;
......@@ -1449,7 +1449,7 @@ fn buildOutputType(
14491449 } else if (mem.eql(u8, arg, "-z")) {
14501450 i += 1;
14511451 if (i >= linker_args.items.len) {
1452 fatal("expected linker arg after '{s}'", .{arg});
1452 fatal("expected linker extension flag after '{s}'", .{arg});
14531453 }
14541454 const z_arg = linker_args.items[i];
14551455 if (mem.eql(u8, z_arg, "nodelete")) {
......@@ -1467,7 +1467,7 @@ fn buildOutputType(
14671467 } else if (mem.eql(u8, z_arg, "relro")) {
14681468 linker_z_relro = true;
14691469 } else {
1470 warn("unsupported linker arg: -z {s}", .{z_arg});
1470 warn("unsupported linker extension flag: -z {s}", .{z_arg});
14711471 }
14721472 } else if (mem.eql(u8, arg, "--major-image-version")) {
14731473 i += 1;