| author |  Alexandros Naskos <alex_naskos@hotmail.com> 2020-10-02 17:00:22+03:00 |
| committer |  GitHub <noreply@github.com> 2020-10-02 17:00:22+03:00 |
| log | cd4c1ea790dff077cec3782f6e9c52fd58c5c6ba |
| tree | 9d89c78ab49c10f191bab378e7f0b4aedc26f726 |
| parent | 006b780d44b80a563f08dabe0bd522a4ad457498 |
| parent | 1296e4a8572864d9a3618e5ac28d0cdfd5c08730 |
| signature |  Signed by PGP key 4AEE18F83AFDEB23 |
Merge pull request #6491 from markfirmware/patch-2
Fixes --linker-script unrecognized1 files changed, 2 insertions(+), 2 deletions(-)
lib- std
lib/std/build.zig+2-2
| ... | ... | @@ -2168,8 +2168,8 @@ pub const LibExeObjStep = struct { |
| 2168 | 2168 | } |
| 2169 | 2169 | |
| 2170 | 2170 | if (self.linker_script) |linker_script| { |
| 2171 | zig_args.append("--linker-script") catch unreachable; | |
| 2172 | zig_args.append(builder.pathFromRoot(linker_script)) catch unreachable; | |
| 2171 | try zig_args.append("--script"); | |
| 2172 | try zig_args.append(builder.pathFromRoot(linker_script)); | |
| 2173 | 2173 | } |
| 2174 | 2174 | |
| 2175 | 2175 | if (self.version_script) |version_script| { |