Commit 8c86043178a30a75aa9ff58b4432964237fb52dc | zig

author	Isaac Freund <mail@isaacfreund.com> 2021-09-21 21:06:10+02:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-09-22 00:46:37-04:00
log	8c86043178a30a75aa9ff58b4432964237fb52dc
tree	353cf610a986a281fd88e02879fdfc18903e308e
parent	5913140b6bf96e168a0167906a78e2d4aac5bd9d

std.build: fix handling of -Dcpu

Currently -Dcpu is completely ignored if -Dtarget isn't passed as well.
Further, -Dcpu=baseline is ignored even if -Dtarget=native is passed.

This patch fixes these 2 issues, always respecting the -Dcpu option if
present.

1 files changed, 7 insertions(+), 6 deletions(-)

lib
- std
  - build.zig

lib/std/build.zig+7-6

 @@ -684,7 +684,11 @@ pub const Builder = struct {
         );
         const mcpu = self.option([]const u8, "cpu", "Target CPU features to add or subtract");
-        const triple = maybe_triple orelse return args.default_target;
+        if (maybe_triple == null and mcpu == null) {
+            return args.default_target;
+        }
+        const triple = maybe_triple orelse "native";
         var diags: CrossTarget.ParseOptions.Diagnostics = .{};
         const selected_target = CrossTarget.parse(.{
 @@ -2432,11 +2436,8 @@ pub const LibExeObjStep = struct {
             if (populated_cpu_features.eql(cross.cpu.features)) {
                 // The CPU name alone is sufficient.
-                // If it is the baseline CPU, no command line args are required.
+                try zig_args.append("-mcpu");
-                if (cross.cpu.model != std.Target.Cpu.baseline(cross.cpu.arch).model) {
+                try zig_args.append(cross.cpu.model.name);
-                    try zig_args.append("-mcpu");
-                    try zig_args.append(cross.cpu.model.name);
-                }
             } else {
                 var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);