From 8acfcf4e0d2edc4b66a0fe80d5fbb9c8898248bb Mon Sep 17 00:00:00 2001 From: markfirmware Date: Thu, 1 Oct 2020 13:15:35 -0400 Subject: [PATCH 1/2] Update build.zig Fixes #6477 --- lib/std/build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/build.zig b/lib/std/build.zig index 7e3c75bc78..a3b4d78c04 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -2168,7 +2168,7 @@ pub const LibExeObjStep = struct { } if (self.linker_script) |linker_script| { - zig_args.append("--linker-script") catch unreachable; + try zig_args.append("--script"); zig_args.append(builder.pathFromRoot(linker_script)) catch unreachable; } From 1296e4a8572864d9a3618e5ac28d0cdfd5c08730 Mon Sep 17 00:00:00 2001 From: markfirmware Date: Thu, 1 Oct 2020 15:27:08 -0400 Subject: [PATCH 2/2] Update build.zig --- lib/std/build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/build.zig b/lib/std/build.zig index a3b4d78c04..292aeb63cd 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -2169,7 +2169,7 @@ pub const LibExeObjStep = struct { if (self.linker_script) |linker_script| { try zig_args.append("--script"); - zig_args.append(builder.pathFromRoot(linker_script)) catch unreachable; + try zig_args.append(builder.pathFromRoot(linker_script)); } if (self.version_script) |version_script| {