From 17596c79a9239edec533a041f9a4da3a7af0d980 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 14 Sep 2022 16:41:53 -0700
Subject: [PATCH] stage2: fix compile error merge conflict

3250b20ceabea044bd4c7b1653d76d7069840058 had a silent merge conflict
with master branch; fixed now.
---
 src/print_env.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/print_env.zig b/src/print_env.zig
index f1a786392b..91b655dcef 100644
--- a/src/print_env.zig
+++ b/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);