mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: fix compile error merge conflict

Browse Source 
3250b20ceabea044bd4c7b1653d76d7069840058 had a silent merge conflict
with master branch; fixed now.
This commit is contained in:
Andrew Kelley 2022-09-14 16:41:53 -07:00
parent 8cab0762d8
commit 17596c79a9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/print_env.zig
View File

@ -21,7 +21,7 @@ pub fn cmdEnv(gpa: Allocator, args: []const []const u8, stdout: std.fs.File.Writ
const global_cache_dir = try introspect.resolveGlobalCacheDir(gpa);
defer gpa.free(global_cache_dir);
const info = try std.zig.system.NativeTargetInfo.detect(gpa, .{});
const info = try std.zig.system.NativeTargetInfo.detect(.{});
const triple = try info.target.zigTriple(gpa);
defer gpa.free(triple);