motiejus/zig

commit c1f404ad537ded5a584525f7f89dcf5705a2c405 (tree)
parent 9bcd48e40e272408879a442b21099ea5ab6b85b4
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Mon,  2 Jan 2023 16:41:13 -0700

Compilation: fix merge conflict with previous commit

Diffstat:
M
src/Compilation.zig
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -1458,7 +1458,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
             .gpa = gpa,
             .manifest_dir = try options.local_cache_directory.handle.makeOpenPath("h", .{}),
         };
-        cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
+        cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
         cache.addPrefix(options.zig_lib_directory);
         cache.addPrefix(options.local_cache_directory);
         errdefer cache.manifest_dir.close();