zig

commit 9ee67b967bd8ed2f11c24078ac16f9fd96b44a39 (tree)
parent 0c1df96b17fcafdb0aa973dfcb1819929719d650
Author: John Schmidt <john.schmidt.h@gmail.com>
Date:   Wed, 19 Jan 2022 15:11:29 +0100

stage2: avoid inferred struct in os_version_check.zig

Before this commit, compiling an empty main with Stage 2 on macOS x86_64 results in

```
../stage2/bin/zig build-exe -ODebug -fLLVM empty_main.zig
error: sub-compilation of compiler_rt failed
    [...]/zig/stage2/lib/zig/std/special/compiler_rt/os_version_check.zig:26:10: error: TODO: Sema.zirStructInit for runtime-known struct values
```

By assigning the value to a variable we can sidestep the issue for now.

Diffstat:
M
lib/std/special/compiler_rt/os_version_check.zig
 | 
11
+++++------

1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/std/special/compiler_rt/os_version_check.zig b/lib/std/special/compiler_rt/os_version_check.zig
@@ -22,12 +22,11 @@ inline fn constructVersion(major: u32, minor: u32, subminor: u32) u32 {
 
 // Darwin-only
 pub fn __isPlatformVersionAtLeast(platform: u32, major: u32, minor: u32, subminor: u32) callconv(.C) i32 {
-    return @boolToInt(_availability_version_check(1, &[_]dyld_build_version_t{
-        .{
-            .platform = platform,
-            .version = constructVersion(major, minor, subminor),
-        },
-    }));
+    const build_version = dyld_build_version_t{
+        .platform = platform,
+        .version = constructVersion(major, minor, subminor),
+    };
+    return @boolToInt(_availability_version_check(1, &[_]dyld_build_version_t{build_version}));
 }
 
 // _availability_version_check darwin API support.