zig

commit 3b235cfa807451ee17067ae8a34596b88bbc2eaf (tree)
parent f6f0b019bee7910702e113be6d33865c592afa2a
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Tue,  3 Mar 2020 21:09:32 -0500

std.zig.CrossTarget: fix compile errors

closes #4620

Diffstat:
M
lib/std/zig/cross_target.zig
 | 
8
+++++---

1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/std/zig/cross_target.zig b/lib/std/zig/cross_target.zig
@@ -355,8 +355,10 @@ pub const CrossTarget = struct {
     }
 
     pub fn getCpuModel(self: CrossTarget) *const Target.Cpu.Model {
-        if (self.cpu_model) |cpu_model| return cpu_model;
-        return self.getCpu().model;
+        return switch (self.cpu_model) {
+            .explicit => |cpu_model| cpu_model,
+            else => self.getCpu().model,
+        };
     }
 
     pub fn getCpuFeatures(self: CrossTarget) Target.Cpu.Feature.Set {
@@ -645,7 +647,7 @@ pub const CrossTarget = struct {
         self.glibc_version = SemVer{ .major = major, .minor = minor, .patch = patch };
     }
 
-    pub fn getObjectFormat(self: CrossTarget) ObjectFormat {
+    pub fn getObjectFormat(self: CrossTarget) Target.ObjectFormat {
         return Target.getObjectFormatSimple(self.getOsTag(), self.getCpuArch());
     }