authorgravatar for emekankurumeh@outlook.comemekoi <emekankurumeh@outlook.com> 2019-10-25 15:23:02-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-16 16:24:54-05:00
logd4e56ae6ae15ed1b062b0d775893abb5579fc66d
treea8020591cb37420b122c5482bbbec274a64d3014
parent13cdc137e6389af83f225ab851bf8ef768ebcc69

added -- to pass args to zig build commands

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

lib/std/build.zig+2
...@@ -54,6 +54,7 @@ pub const Builder = struct {...@@ -54,6 +54,7 @@ pub const Builder = struct {
54 is_release: bool,54 is_release: bool,
55 override_lib_dir: ?[]const u8,55 override_lib_dir: ?[]const u8,
56 vcpkg_root: VcpkgRoot,56 vcpkg_root: VcpkgRoot,
57 args: ?[][]const u8,
57 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,58 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,
5859
59 const PkgConfigError = error{60 const PkgConfigError = error{
...@@ -160,6 +161,7 @@ pub const Builder = struct {...@@ -160,6 +161,7 @@ pub const Builder = struct {
160 .override_lib_dir = null,161 .override_lib_dir = null,
161 .install_path = undefined,162 .install_path = undefined,
162 .vcpkg_root = VcpkgRoot{ .Unattempted = {} },163 .vcpkg_root = VcpkgRoot{ .Unattempted = {} },
164 .args = null,
163 };165 };
164 try self.top_level_steps.append(&self.install_tls);166 try self.top_level_steps.append(&self.install_tls);
165 try self.top_level_steps.append(&self.uninstall_tls);167 try self.top_level_steps.append(&self.uninstall_tls);
lib/std/special/build_runner.zig+4
...@@ -98,6 +98,10 @@ pub fn main() !void {...@@ -98,6 +98,10 @@ pub fn main() !void {
98 builder.verbose_cimport = true;98 builder.verbose_cimport = true;
99 } else if (mem.eql(u8, arg, "--verbose-cc")) {99 } else if (mem.eql(u8, arg, "--verbose-cc")) {
100 builder.verbose_cc = true;100 builder.verbose_cc = true;
101 } else if (mem.eql(u8, arg, "--")) {
102 var arg_slice = try process.argsAlloc(allocator);
103 builder.args = arg_slice[arg_it.index..];
104 break;
101 } else {105 } else {
102 warn("Unrecognized argument: {}\n\n", .{arg});106 warn("Unrecognized argument: {}\n\n", .{arg});
103 return usageAndErr(builder, false, stderr_stream);107 return usageAndErr(builder, false, stderr_stream);