Commit `469643940c`

Ryan Liptak <squeek502@hotmail.com>

2024-03-04 04:39:15

Use the global cache dir for the manifests of generated mingw `.lib`s

Fixes a mismatch where the manifests would be written to the local cache dir, but the .def/.lib files themselves would be written to the global cache dir. This meant that if you cleared your global cache, your local cache would still think that the .lib files existed in the cache and it'd lead to 'No such file or directory' errors at linktime. This mismatch was introduced in the stage1 -> stage2 transition of this code.

master

1 parent 90c1a2c

Changed files (1)

src

mingw.zig

@@ -178,13 +178,15 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
 
     const target = comp.getTarget();
 
+    // Use the global cache directory.
     var cache: Cache = .{
         .gpa = comp.gpa,
-        .manifest_dir = comp.cache_parent.manifest_dir,
+        .manifest_dir = try comp.global_cache_directory.handle.makeOpenPath("h", .{}),
     };
-    for (comp.cache_parent.prefixes()) |prefix| {
-        cache.addPrefix(prefix);
-    }
+    cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
+    cache.addPrefix(comp.zig_lib_directory);
+    cache.addPrefix(comp.global_cache_directory);
+    defer cache.manifest_dir.close();
 
     cache.hash.addBytes(build_options.version);
     cache.hash.addOptionalBytes(comp.zig_lib_directory.path);

Commit 469643940c

Commit `469643940c`