motiejus/zig
1
Fork 0
Code Releases Activity

Compilation: fix merge conflict with previous commit

Browse Source
This commit is contained in:
Andrew Kelley
2023-01-02 16:41:13 -07:00
parent 9bcd48e40e
commit c1f404ad53
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Compilation.zig
View File

@@ -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();