zig

commit f18576afad6b385377ba8fd18be3d05f7dc98c57 (tree)
parent 2637b573761bd14c089f01d8310fc26bc9ec1d47
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu,  1 Feb 2024 19:22:05 -0700

std.Build.resolveTargetQuery: fix ignoring ofmt for native

Diffstat:
M
lib/std/Build.zig
 | 
9
++++++++-

1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/std/Build.zig b/lib/std/Build.zig
@@ -2311,7 +2311,14 @@ pub const ResolvedTarget = struct {
 /// Converts a target query into a fully resolved target that can be passed to
 /// various parts of the API.
 pub fn resolveTargetQuery(b: *Build, query: Target.Query) ResolvedTarget {
-    if (query.isNative()) return b.host;
+    if (query.isNative()) {
+        var adjusted = b.host;
+        if (query.ofmt) |ofmt| {
+            adjusted.query.ofmt = ofmt;
+            adjusted.result.ofmt = ofmt;
+        }
+        return adjusted;
+    }
 
     return .{
         .query = query,