From 35ea4a7d7a59ad60e5cfa39cdaa1e5bf98c05163 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sat, 24 Jan 2026 21:10:07 +0200 Subject: [PATCH 1/2] Driver: treat isysroot as an alias to --sysroot This isn't correct because -isysroot should only be used for finding headers, except for MacOS where it is also used for libraries if --sysroot isn't specified, but it shouldn't matter since we don't even have -l yet. --- src/aro/Driver.zig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/aro/Driver.zig b/src/aro/Driver.zig index 4d25f181..1cd487f8 100644 --- a/src/aro/Driver.zig +++ b/src/aro/Driver.zig @@ -657,6 +657,24 @@ pub fn parseArgs( d.output_name = file; } else if (option(arg, "--sysroot=")) |sysroot| { d.sysroot = sysroot; + } else if (mem.eql(u8, arg, "--sysroot")) { + i += 1; + if (i >= args.len) { + try d.err("expected argument after --sysroot", .{}); + continue; + } + d.sysroot = args[i]; + } else if (mem.startsWith(u8, arg, "-isysroot")){ + var path = arg["-isysroot".len..]; + if (path.len == 0) { + i += 1; + if (i >= args.len) { + try d.err("expected argument after -isysroot", .{}); + continue; + } + path = args[i]; + } + d.sysroot = path; } else if (mem.eql(u8, arg, "-rpath")) { i += 1; if (i >= args.len) { From 8dbc73db5088391c5e1f4c7414b8decc060dc42e Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sun, 25 Jan 2026 12:58:38 +0200 Subject: [PATCH 2/2] fmt --- src/aro/Driver.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aro/Driver.zig b/src/aro/Driver.zig index 1cd487f8..b3804344 100644 --- a/src/aro/Driver.zig +++ b/src/aro/Driver.zig @@ -664,7 +664,7 @@ pub fn parseArgs( continue; } d.sysroot = args[i]; - } else if (mem.startsWith(u8, arg, "-isysroot")){ + } else if (mem.startsWith(u8, arg, "-isysroot")) { var path = arg["-isysroot".len..]; if (path.len == 0) { i += 1;