From b08038b5ca29220e47904fb9185054d113ee8cea Mon Sep 17 00:00:00 2001 From: zplin Date: Thu, 23 Jul 2026 23:55:23 +0000 Subject: [PATCH] Extend zig-wrapper colon-library workaround --- toolchain/zig-wrapper.zig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/toolchain/zig-wrapper.zig b/toolchain/zig-wrapper.zig index dfb8900..2f241d0 100644 --- a/toolchain/zig-wrapper.zig +++ b/toolchain/zig-wrapper.zig @@ -302,9 +302,17 @@ fn resolveColonLibraries( args: *ArrayListUnmanaged([]const u8), ) error{OutOfMemory}!void { var lib_paths = ArrayListUnmanaged([]const u8){}; - for (args.items) |arg| { - if (mem.startsWith(u8, arg, "-L") and arg.len > 2) + var j: usize = 0; + while (j < args.items.len) : (j += 1) { + const arg = args.items[j]; + // Bazel passes the search path as a separate argument ("-L" "path"); + // other callers may fuse them ("-Lpath"). Collect both forms. + if (mem.eql(u8, arg, "-L") and j + 1 < args.items.len) { + j += 1; + try lib_paths.append(arena, args.items[j]); + } else if (mem.startsWith(u8, arg, "-L") and arg.len > 2) { try lib_paths.append(arena, arg[2..]); + } } var i: usize = 0;