| ... | @@ -4944,7 +4944,6 @@ fn cmdBuild( | ... | @@ -4944,7 +4944,6 @@ fn cmdBuild( |
| 4944 | var override_global_cache_dir: ?[]const u8 = EnvVar.ZIG_GLOBAL_CACHE_DIR.get(environ_map); | 4944 | var override_global_cache_dir: ?[]const u8 = EnvVar.ZIG_GLOBAL_CACHE_DIR.get(environ_map); |
| 4945 | var override_local_cache_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_CACHE_DIR.get(environ_map); | 4945 | var override_local_cache_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_CACHE_DIR.get(environ_map); |
| 4946 | var override_pkg_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_PKG_DIR.get(environ_map); | 4946 | var override_pkg_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_PKG_DIR.get(environ_map); |
| 4947 | var override_make_runner: ?[]const u8 = EnvVar.ZIG_BUILD_RUNNER.get(environ_map); | | |
| 4948 | var maker_optimize_mode: std.builtin.OptimizeMode = if (EnvVar.ZIG_DEBUG_CMD.isSet(environ_map)) | 4947 | var maker_optimize_mode: std.builtin.OptimizeMode = if (EnvVar.ZIG_DEBUG_CMD.isSet(environ_map)) |
| 4949 | .Debug | 4948 | .Debug |
| 4950 | else | 4949 | else |
| ... | @@ -5074,11 +5073,6 @@ fn cmdBuild( | ... | @@ -5074,11 +5073,6 @@ fn cmdBuild( |
| 5074 | i += 1; | 5073 | i += 1; |
| 5075 | override_lib_dir = args[i]; | 5074 | override_lib_dir = args[i]; |
| 5076 | continue; | 5075 | continue; |
| 5077 | } else if (mem.eql(u8, arg, "--build-runner")) { | | |
| 5078 | if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg}); | | |
| 5079 | i += 1; | | |
| 5080 | override_make_runner = args[i]; | | |
| 5081 | continue; | | |
| 5082 | } else if (mem.eql(u8, arg, "--cache-dir")) { | 5076 | } else if (mem.eql(u8, arg, "--cache-dir")) { |
| 5083 | if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg}); | 5077 | if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg}); |
| 5084 | i += 1; | 5078 | i += 1; |
| ... | @@ -5365,10 +5359,7 @@ fn cmdBuild( | ... | @@ -5365,10 +5359,7 @@ fn cmdBuild( |
| 5365 | // We want to release all the locks before executing the child process, so we make a nice | 5359 | // We want to release all the locks before executing the child process, so we make a nice |
| 5366 | // big block here to ensure the cleanup gets run when we extract out our argv. | 5360 | // big block here to ensure the cleanup gets run when we extract out our argv. |
| 5367 | { | 5361 | { |
| 5368 | const main_mod_paths: Package.Module.CreateOptions.Paths = if (override_make_runner) |runner| .{ | 5362 | const main_mod_paths: Package.Module.CreateOptions.Paths = .{ |
| 5369 | .root = try .fromUnresolved(arena, dirs, &.{fs.path.dirname(runner) orelse "."}), | | |
| 5370 | .root_src_path = fs.path.basename(runner), | | |
| 5371 | } else .{ | | |
| 5372 | .root = try .fromRoot(arena, dirs, .zig_lib, "compiler"), | 5363 | .root = try .fromRoot(arena, dirs, .zig_lib, "compiler"), |
| 5373 | .root_src_path = "configurer.zig", | 5364 | .root_src_path = "configurer.zig", |
| 5374 | }; | 5365 | }; |