| ... | ... | @@ -881,22 +881,6 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 881 | 881 | const io = graph.io; |
| 882 | 882 | const arena = graph.arena; |
| 883 | 883 | |
| 884 | | // Cache lookup for configure options. If we get a match, we can skip |
| 885 | | // execution of the configure script. If not, we get the file path to pass |
| 886 | | // to the configure process. |
| 887 | | // |
| 888 | | // In the hot path, we only check this cache, which means that also |
| 889 | | // configure source files need to go in here. |
| 890 | | var config_man = graph.cache.obtain(); |
| 891 | | defer config_man.deinit(); |
| 892 | | |
| 893 | | for (options.cached_passthru_configure) |i| |
| 894 | | config_man.hash.addBytes(configure_argv[i]); |
| 895 | | |
| 896 | | // Prevents a `zig build` from getting a false positive cache hit following |
| 897 | | // a `zig build --cache-poison=ignored`. |
| 898 | | config_man.hash.add(options.cache_poison == .ignored); |
| 899 | | |
| 900 | 884 | configure_argv[options.conf_argv_index_build_root] = options.build_root.directory.path orelse options.cwd_path; |
| 901 | 885 | |
| 902 | 886 | var http_client: std.http.Client = .{ .allocator = gpa, .io = io }; |
| ... | ... | @@ -958,7 +942,6 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 958 | 942 | // some code to help when debugging edits to the build runner so that you |
| 959 | 943 | // can make sure it compiles successfully on other targets. |
| 960 | 944 | const target_arch_os_abi: ?[]const u8 = if (options.debug_target) |triple| t: { |
| 961 | | config_man.hash.addBytes(triple); |
| 962 | 945 | try build_configurer_argv.appendSlice(gpa, &.{ "-target", triple }); |
| 963 | 946 | break :t triple; |
| 964 | 947 | } else null; |
| ... | ... | @@ -997,7 +980,26 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 997 | 980 | |
| 998 | 981 | // This loop is re-evaluated when the build script exits with an indication that it |
| 999 | 982 | // could not continue due to missing lazy dependencies. |
| 1000 | | const configuration_path: Path, const poisoned: bool = cp: while (true) { |
| 983 | const configuration_path: Path, var configuration_lock: ?Cache.Lock = cp: while (true) { |
| 984 | // Cache lookup for configure options. If we get a match, we can skip |
| 985 | // execution of the configure script. If not, we get the file path to pass |
| 986 | // to the configure process. |
| 987 | // |
| 988 | // In the hot path, we only check this cache, which means that also |
| 989 | // configure source files need to go in here. |
| 990 | var config_man = graph.cache.obtain(); |
| 991 | defer config_man.deinit(); |
| 992 | |
| 993 | for (options.cached_passthru_configure) |i| |
| 994 | config_man.hash.addBytes(configure_argv[i]); |
| 995 | |
| 996 | if (target_arch_os_abi) |triple| |
| 997 | config_man.hash.addBytes(triple); |
| 998 | |
| 999 | // Prevents a `zig build` from getting a false positive cache hit following |
| 1000 | // a `zig build --cache-poison=ignored`. |
| 1001 | config_man.hash.add(options.cache_poison == .ignored); |
| 1002 | |
| 1001 | 1003 | build_mod.deps.clearRetainingCapacity(); |
| 1002 | 1004 | deps_mod.deps.clearRetainingCapacity(); |
| 1003 | 1005 | |
| ... | ... | @@ -1223,7 +1225,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 1223 | 1225 | .root_dir = graph.local_cache_root, |
| 1224 | 1226 | .sub_path = try arena.print("c/{s}", .{&digest}), |
| 1225 | 1227 | }, |
| 1226 | | false, |
| 1228 | config_man.toOwnedLock(), |
| 1227 | 1229 | }; |
| 1228 | 1230 | }, |
| 1229 | 1231 | .poisoned => {}, // Don't bother checking for cache hit. |
| ... | ... | @@ -1327,7 +1329,7 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 1327 | 1329 | // If it is poisoned, there is no point in moving it to cached |
| 1328 | 1330 | // location. Just leave it in the tmp directory. |
| 1329 | 1331 | if (configuration.poisoned) { |
| 1330 | | break :cp .{ config_tmp_path, true }; |
| 1332 | break :cp .{ config_tmp_path, null }; |
| 1331 | 1333 | } else { |
| 1332 | 1334 | const digest = config_man.final(); |
| 1333 | 1335 | const final_path: Path = .{ |
| ... | ... | @@ -1361,12 +1363,10 @@ fn configure(graph: *Graph, options: ConfigureOptions) !ScannedConfig { |
| 1361 | 1363 | }); |
| 1362 | 1364 | }; |
| 1363 | 1365 | config_man.writeManifest() catch |err| log.warn("failed to write cache manifest: {t}", .{err}); |
| 1364 | | break :cp .{ final_path, false }; |
| 1366 | break :cp .{ final_path, config_man.toOwnedLock() }; |
| 1365 | 1367 | } |
| 1366 | 1368 | }; |
| 1367 | | |
| 1368 | 1369 | // Hang on to the configuration file lock until we finish loading the configuration file. |
| 1369 | | var configuration_lock = if (!poisoned) config_man.toOwnedLock() else null; |
| 1370 | 1370 | defer if (configuration_lock) |*l| l.release(io); |
| 1371 | 1371 | |
| 1372 | 1372 | switch (options.print_configuration) { |
Andrew Kelley <andrew@ziglang.org> 2026-07-01 14:41:47-07:00
lib