authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-02 16:41:13-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-02 16:41:13-07:00
logc1f404ad537ded5a584525f7f89dcf5705a2c405
treeb1f0bc587dc50fc3337535d4d239f64eb2a484bc
parent9bcd48e40e272408879a442b21099ea5ab6b85b4

Compilation: fix merge conflict with previous commit

1 files changed, 1 insertions(+), 1 deletions(-)

src/Compilation.zig+1-1
...@@ -1458,7 +1458,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {...@@ -1458,7 +1458,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1458 .gpa = gpa,1458 .gpa = gpa,
1459 .manifest_dir = try options.local_cache_directory.handle.makeOpenPath("h", .{}),1459 .manifest_dir = try options.local_cache_directory.handle.makeOpenPath("h", .{}),
1460 };1460 };
1461 cache.addPrefix(.{ .path = null, .handle = fs.cwd() });1461 cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
1462 cache.addPrefix(options.zig_lib_directory);1462 cache.addPrefix(options.zig_lib_directory);
1463 cache.addPrefix(options.local_cache_directory);1463 cache.addPrefix(options.local_cache_directory);
1464 errdefer cache.manifest_dir.close();1464 errdefer cache.manifest_dir.close();