Commit f01c3150c19fa3d6c605cc1940f70cce303c5997 | zig

author	Isaac Freund <mail@isaacfreund.com> 2020-10-13 20:06:03+02:00
committer	Isaac Freund <mail@isaacfreund.com> 2020-10-13 20:06:03+02:00
log	f01c3150c19fa3d6c605cc1940f70cce303c5997
tree	6681df7149b1e9ff8c6fc64d41365ab0cf0c8f12
parent	ea45ee54843b10a433bb223caa9706d8253e3222
signature	Commit is signed but in an unrecognized format.

2 files changed, 16 insertions(+), 0 deletions(-)

lib/std/build.zig+6

...	...	@@ -45,6 +45,7 @@ pub const Builder = struct {
45	45	verbose_llvm_ir: bool,
46	46	verbose_cimport: bool,
47	47	verbose_llvm_cpu_features: bool,
	48	color: enum { auto, on, off } = .auto,
48	49	invalid_user_input: bool,
49	50	zig_exe: []const u8,
50	51	default_step: *Step,
...	...	@@ -1946,6 +1947,11 @@ pub const LibExeObjStep = struct {
1946	1947	};
1947	1948	zig_args.append(cmd) catch unreachable;
1948	1949
	1950	if (builder.color != .auto) {
	1951	try zig_args.append("--color");
	1952	try zig_args.append(@tagName(builder.color));
	1953	}
	1954
1949	1955	if (self.root_src) \|root_src\| try zig_args.append(root_src.getPath(builder));
1950	1956
1951	1957	var prev_has_extra_flags = false;

lib/std/special/build_runner.zig+10

...	...	@@ -82,6 +82,15 @@ pub fn main() !void {
82	82	return usageAndErr(builder, false, stderr_stream);
83	83	};
84	84	builder.addSearchPrefix(search_prefix);
	85	} else if (mem.eql(u8, arg, "--color")) {
	86	const next_arg = nextArg(args, &arg_idx) orelse {
	87	warn("expected [auto\|on\|off] after --color", .{});
	88	return usageAndErr(builder, false, stderr_stream);
	89	};
	90	builder.color = std.meta.stringToEnum(@TypeOf(builder.color), next_arg) orelse {
	91	warn("expected [auto\|on\|off] after --color, found '{}'", .{next_arg});
	92	return usageAndErr(builder, false, stderr_stream);
	93	};
85	94	} else if (mem.eql(u8, arg, "--override-lib-dir")) {
86	95	builder.override_lib_dir = nextArg(args, &arg_idx) orelse {
87	96	warn("Expected argument after --override-lib-dir\n\n", .{});
...	...	@@ -171,6 +180,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void
171	180	\\ --verbose Print commands before executing them
172	181	\\ --prefix [path] Override default install prefix
173	182	\\ --search-prefix [path] Add a path to look for binaries, libraries, headers
	183	\\ --color [auto\|off\|on] Enable or disable colored error messages
174	184	\\
175	185	\\Project-Specific Options:
176	186	\\