diff --git a/lib/std/Build/Step/Options.zig b/lib/std/Build/Step/Options.zig
index 362e030e5a..9ed936fe7e 100644
--- a/lib/std/Build/Step/Options.zig
+++ b/lib/std/Build/Step/Options.zig
@@ -294,7 +294,12 @@ test Options {
     var arena = std.heap.ArenaAllocator.init(std.testing.allocator);
     defer arena.deinit();
 
-    const host = try std.zig.system.NativeTargetInfo.detect(.{});
+    const detected = try std.zig.system.NativeTargetInfo.detect(.{});
+    const host: std.Build.ResolvedTarget = .{
+        .query = .{},
+        .target = detected.target,
+        .dynamic_linker = detected.dynamic_linker,
+    };
 
     var cache: std.Build.Cache = .{
         .gpa = arena.allocator(),
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index 89e014190c..9af804fa0a 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -212,7 +212,7 @@ pub const BuildId = union(enum) {
     hexstring: HexString,
 
     pub fn eql(a: BuildId, b: BuildId) bool {
-        const Tag = @TypeOf(BuildId).Union.tag_type.?;
+        const Tag = @typeInfo(BuildId).Union.tag_type.?;
         const a_tag: Tag = a;
         const b_tag: Tag = b;
         if (a_tag != b_tag) return false;