Commit cebcacd872a05d8ee3edaafe3eff5cc6e73657b7 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-02-26 14:33:36-05:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-02-28 14:51:54-05:00
log	cebcacd872a05d8ee3edaafe3eff5cc6e73657b7
tree	3dec36b8ae09ca06bfe242edbcaf74d809d96120
parent	cf233bad5884b9bd782256eb6808fcc6abda645c
signature	Commit is signed but in an unrecognized format.

fix standardTargetOptions and improve init-exe to use it

2 files changed, 29 insertions(+), 5 deletions(-)

lib
- std
  - build.zig
  - special
    init-exe
    build.zig

lib/std/build.zig+19-5

 @@ -525,7 +525,7 @@ pub const Builder = struct {
     pub const StandardTargetOptionsArgs = struct {
         whitelist: ?[]const CrossTarget = null,
-        default_target: CrossTarget = .{},
+        default_target: CrossTarget = CrossTarget{},
     };
     /// Exposes standard `zig build` options for choosing a target.
 @@ -533,12 +533,12 @@ pub const Builder = struct {
         const triple = self.option(
             []const u8,
             "target",
-            "The Arch, OS, and ABI to build for.",
+            "The CPU architecture, OS, and ABI to build for.",
         ) orelse return args.default_target;
         // TODO add cpu and features as part of the target triple
-        var diags: std.Target.ParseOptions.Diagnostics = .{};
+        var diags: CrossTarget.ParseOptions.Diagnostics = .{};
         const selected_target = CrossTarget.parse(.{
             .arch_os_abi = triple,
             .diagnostics = &diags,
 @@ -567,7 +567,21 @@ pub const Builder = struct {
                 }
                 process.exit(1);
             },
-            else => |e| return e,
+            error.UnknownOperatingSystem => {
+                std.debug.warn(
+                    \\Unknown OS: '{}'
+                    \\Available operating systems:
+                    \\
+                , .{diags.os_name});
+                inline for (std.meta.fields(std.Target.Os.Tag)) |field| {
+                    std.debug.warn(" {}\n", .{field.name});
+                }
+                process.exit(1);
+            },
+            else => |e| {
+                std.debug.warn("Unable to parse target '{}': {}\n", .{ triple, @errorName(e) });
+                process.exit(1);
+            },
         };
         const selected_canonicalized_triple = selected_target.zigTriple(self.allocator) catch unreachable;
 @@ -585,7 +599,7 @@ pub const Builder = struct {
             });
             for (list) |t| {
                 const t_triple = t.zigTriple(self.allocator) catch unreachable;
-                std.debug.warn(" {}\n", t_triple);
+                std.debug.warn(" {}\n", .{t_triple});
             }
             // TODO instead of process exit, return error and have a zig build flag implemented by
             // the build runner that turns process exits into error return traces

lib/std/special/init-exe/build.zig+10

...	@@ -1,8 +1,18 @@	...	@@ -1,8 +1,18 @@
1	const Builder = @import("std").build.Builder;	1	const Builder = @import("std").build.Builder;
2		2
3	pub fn build(b: *Builder) void {	3	pub fn build(b: *Builder) void {
		4	// Standard target options allows the person running `zig build` to choose
		5	// what target to build for. Here we do not override the defaults, which
		6	// means any target is allowed, and the default is native. Other options
		7	// for restricting supported target set are available.
		8	const target = b.standardTargetOptions(.{});
		9
		10	// Standard release options allow the person running `zig build` to select
		11	// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
4	const mode = b.standardReleaseOptions();	12	const mode = b.standardReleaseOptions();
		13
5	const exe = b.addExecutable("$", "src/main.zig");	14	const exe = b.addExecutable("$", "src/main.zig");
		15	exe.setTarget(target);
6	exe.setBuildMode(mode);	16	exe.setBuildMode(mode);
7	exe.install();	17	exe.install();
8		18