Merge pull request #2295 from ziglang/stage1-hybrid

stage1 is now a hybrid of C++ and Zig

2 files changed, 38 insertions, 9 deletions

diff --git a/std/build.zig b/std/build.zig
index 2bd4a9b08f..4d6c915438 100644
--- a/std/build.zig
+++ b/std/build.zig
@@ -50,6 +50,8 @@ pub const Builder = struct {
     build_root: []const u8,
     cache_root: []const u8,
     release_mode: ?builtin.Mode,
+    override_std_dir: ?[]const u8,
+    override_lib_dir: ?[]const u8,
 
     pub const CStd = enum {
         C89,
@@ -133,6 +135,8 @@ pub const Builder = struct {
             },
             .have_install_step = false,
             .release_mode = null,
+            .override_std_dir = null,
+            .override_lib_dir = null,
         };
         self.detectNativeSystemPaths();
         self.default_step = self.step("default", "Build the project");
@@ -939,6 +943,7 @@ pub const LibExeObjStep = struct {
     disable_gen_h: 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,
     name_prefix: []const u8,
@@ -1039,6 +1044,7 @@ pub const LibExeObjStep = struct {
             .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,
             .name_prefix = "",
@@ -1528,6 +1534,17 @@ 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));
+        } else if (self.builder.override_lib_dir) |dir| {
+            try zig_args.append("--override-lib-dir");
+            try zig_args.append(builder.pathFromRoot(dir));
         }
 
         if (self.main_pkg_path) |dir| {
diff --git a/std/special/build_runner.zig b/std/special/build_runner.zig
index 56cfe3bcb5..dfc3838577 100644
--- a/std/special/build_runner.zig
+++ b/std/special/build_runner.zig
@@ -94,6 +94,16 @@ 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");
+                    return usageAndErr(&builder, false, try stderr_stream);
+                });
             } else if (mem.eql(u8, arg, "--verbose-tokenize")) {
                 builder.verbose_tokenize = true;
             } else if (mem.eql(u8, arg, "--verbose-ast")) {
@@ -187,15 +197,17 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: var) !void {
     try out_stream.write(
         \\
         \\Advanced Options:
-        \\  --build-file [file]    Override path to build.zig
-        \\  --cache-dir [path]     Override path to zig cache directory
-        \\  --verbose-tokenize     Enable compiler debug output for tokenization
-        \\  --verbose-ast          Enable compiler debug output for parsing into an AST
-        \\  --verbose-link         Enable compiler debug output for linking
-        \\  --verbose-ir           Enable compiler debug output for Zig IR
-        \\  --verbose-llvm-ir      Enable compiler debug output for LLVM IR
-        \\  --verbose-cimport      Enable compiler debug output for C imports
-        \\  --verbose-cc           Enable compiler debug output for C compilation
+        \\  --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
+        \\  --verbose-link           Enable compiler debug output for linking
+        \\  --verbose-ir             Enable compiler debug output for Zig IR
+        \\  --verbose-llvm-ir        Enable compiler debug output for LLVM IR
+        \\  --verbose-cimport        Enable compiler debug output for C imports
+        \\  --verbose-cc             Enable compiler debug output for C compilation
         \\
     );
 }