authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-11-01 11:56:25+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-11-02 14:10:16-07:00
log54bdc0108a38cccbcfd42030ff4f899686a19fc3
tree5455f26bed7eeba9723f23519b7d06d82137274b
parent57caec858558fefc9c0b898a3545dc19a66d75a0

cli: set sysroot when --sysroot option was passed

Fixes regression introduced in https://github.com/ziglang/zig/commit/0b47e69b7c0aedbc142400305cda86ef58b41656

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

src/main.zig+2-1
...@@ -1034,8 +1034,9 @@ fn buildOutputType(...@@ -1034,8 +1034,9 @@ fn buildOutputType(
1034 } else if (mem.eql(u8, arg, "--dynamic-linker")) {1034 } else if (mem.eql(u8, arg, "--dynamic-linker")) {
1035 target_dynamic_linker = args_iter.nextOrFatal();1035 target_dynamic_linker = args_iter.nextOrFatal();
1036 } else if (mem.eql(u8, arg, "--sysroot")) {1036 } else if (mem.eql(u8, arg, "--sysroot")) {
1037 sysroot = args_iter.nextOrFatal();
1037 try clang_argv.append("-isysroot");1038 try clang_argv.append("-isysroot");
1038 try clang_argv.append(args_iter.nextOrFatal());1039 try clang_argv.append(sysroot.?);
1039 } else if (mem.eql(u8, arg, "--libc")) {1040 } else if (mem.eql(u8, arg, "--libc")) {
1040 libc_paths_file = args_iter.nextOrFatal();1041 libc_paths_file = args_iter.nextOrFatal();
1041 } else if (mem.eql(u8, arg, "--test-filter")) {1042 } else if (mem.eql(u8, arg, "--test-filter")) {