authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-09-14 16:41:53-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-09-14 16:41:53-07:00
log17596c79a9239edec533a041f9a4da3a7af0d980
tree59e34ecfddb68d55627a2bb1faf50e9af3e7f9ea
parent8cab0762d86d405f21877045e67bd1858c75e258

stage2: fix compile error merge conflict

3250b20ceabea044bd4c7b1653d76d7069840058 had a silent merge conflict with master branch; fixed now.

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

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