diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-09-25 23:57:47 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-09-25 23:59:07 -0400 |
| commit | dc7016344eeb3ba2d58f80968c3df9503e7c72e7 (patch) | |
| tree | 2cf21d7ab6f81b3270c90518f6b176ffc8ec3dc7 /lib | |
| parent | ed36dbbd9c9dc21b2eebae1b31586fea1c6b51c3 (diff) | |
| download | zig-dc7016344eeb3ba2d58f80968c3df9503e7c72e7.tar.gz zig-dc7016344eeb3ba2d58f80968c3df9503e7c72e7.zip | |
remove --override-std-dir. fix issues caused by moving std lib
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/build.zig | 16 | ||||
| -rw-r--r-- | lib/std/special/build_runner.zig | 6 |
2 files changed, 2 insertions, 20 deletions
diff --git a/lib/std/build.zig b/lib/std/build.zig index 7f9a77351d..3b5299f523 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -52,7 +52,6 @@ pub const Builder = struct { cache_root: []const u8, release_mode: ?builtin.Mode, is_release: bool, - override_std_dir: ?[]const u8, override_lib_dir: ?[]const u8, pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null, @@ -158,7 +157,6 @@ pub const Builder = struct { }, .release_mode = null, .is_release = false, - .override_std_dir = null, .override_lib_dir = null, .install_path = undefined, }; @@ -1439,7 +1437,6 @@ pub const LibExeObjStep = struct { bundle_compiler_rt: bool, disable_stack_probing: bool, c_std: Builder.CStd, - override_std_dir: ?[]const u8, override_lib_dir: ?[]const u8, main_pkg_path: ?[]const u8, exec_cmd_args: ?[]const ?[]const u8, @@ -1570,7 +1567,6 @@ pub const LibExeObjStep = struct { .build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable, .c_std = Builder.CStd.C99, .system_linker_hack = false, - .override_std_dir = null, .override_lib_dir = null, .main_pkg_path = null, .exec_cmd_args = null, @@ -1883,8 +1879,8 @@ pub const LibExeObjStep = struct { self.build_mode = mode; } - pub fn overrideStdDir(self: *LibExeObjStep, dir_path: []const u8) void { - self.override_std_dir = dir_path; + pub fn overrideZigLibDir(self: *LibExeObjStep, dir_path: []const u8) void { + self.override_lib_dir = self.builder.dupe(dir_path); } pub fn setMainPkgPath(self: *LibExeObjStep, dir_path: []const u8) void { @@ -2300,14 +2296,6 @@ pub const LibExeObjStep = struct { } } - if (self.override_std_dir) |dir| { - try zig_args.append("--override-std-dir"); - try zig_args.append(builder.pathFromRoot(dir)); - } else if (self.builder.override_std_dir) |dir| { - try zig_args.append("--override-std-dir"); - try zig_args.append(builder.pathFromRoot(dir)); - } - if (self.override_lib_dir) |dir| { try zig_args.append("--override-lib-dir"); try zig_args.append(builder.pathFromRoot(dir)); diff --git a/lib/std/special/build_runner.zig b/lib/std/special/build_runner.zig index 01e307d46e..efe3275fe6 100644 --- a/lib/std/special/build_runner.zig +++ b/lib/std/special/build_runner.zig @@ -90,11 +90,6 @@ pub fn main() !void { return usageAndErr(builder, false, try stderr_stream); }); builder.addSearchPrefix(search_prefix); - } else if (mem.eql(u8, arg, "--override-std-dir")) { - builder.override_std_dir = try unwrapArg(arg_it.next(allocator) orelse { - warn("Expected argument after --override-std-dir\n\n"); - return usageAndErr(builder, false, try stderr_stream); - }); } else if (mem.eql(u8, arg, "--override-lib-dir")) { builder.override_lib_dir = try unwrapArg(arg_it.next(allocator) orelse { warn("Expected argument after --override-lib-dir\n\n"); @@ -199,7 +194,6 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void { \\Advanced Options: \\ --build-file [file] Override path to build.zig \\ --cache-dir [path] Override path to zig cache directory - \\ --override-std-dir [arg] Override path to Zig standard library \\ --override-lib-dir [arg] Override path to Zig lib directory \\ --verbose-tokenize Enable compiler debug output for tokenization \\ --verbose-ast Enable compiler debug output for parsing into an AST |