authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-16 16:36:42-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-12-16 16:36:42-05:00
logb1abe4a1720773e5c33387e6608b192530239552
tree964f3ff18800ff2530e9e96d98de3deb73a252bf
parent744133acb1358a9c3ed55001571c7cc7778563bd
signaturelock-open Commit is signed but in an unrecognized format.

Revert "added -- to pass args to zig build commands"

This reverts commit d4e56ae6ae15ed1b062b0d775893abb5579fc66d. This broke the build

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

lib/std/build.zig-2
...@@ -54,7 +54,6 @@ pub const Builder = struct {...@@ -54,7 +54,6 @@ 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,
58 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,57 pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,
5958
60 const PkgConfigError = error{59 const PkgConfigError = error{
...@@ -161,7 +160,6 @@ pub const Builder = struct {...@@ -161,7 +160,6 @@ pub const Builder = struct {
161 .override_lib_dir = null,160 .override_lib_dir = null,
162 .install_path = undefined,161 .install_path = undefined,
163 .vcpkg_root = VcpkgRoot{ .Unattempted = {} },162 .vcpkg_root = VcpkgRoot{ .Unattempted = {} },
164 .args = null,
165 };163 };
166 try self.top_level_steps.append(&self.install_tls);164 try self.top_level_steps.append(&self.install_tls);
167 try self.top_level_steps.append(&self.uninstall_tls);165 try self.top_level_steps.append(&self.uninstall_tls);
lib/std/special/build_runner.zig-4
...@@ -98,10 +98,6 @@ pub fn main() !void {...@@ -98,10 +98,6 @@ 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;
105 } else {101 } else {
106 warn("Unrecognized argument: {}\n\n", .{arg});102 warn("Unrecognized argument: {}\n\n", .{arg});
107 return usageAndErr(builder, false, stderr_stream);103 return usageAndErr(builder, false, stderr_stream);