Commit 17596c79a9

Andrew Kelley <andrew@ziglang.org>
2022-09-15 01:41:53
stage2: fix compile error merge conflict
3250b20ceabea044bd4c7b1653d76d7069840058 had a silent merge conflict with master branch; fixed now.
1 parent 8cab076
Changed files (1)
src/print_env.zig
@@ -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);