Commit 0c5ad335d293be638b8d34e671cf62f84b0babce | zig

author	Andrew Kelley <andrew@ziglang.org> 2022-04-19 14:40:27-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2022-04-19 14:40:27-07:00
log	0c5ad335d293be638b8d34e671cf62f84b0babce
tree	fb06d4122b52921129470cb07e3c1a883d74188e
parent	9c2cbe39c2caa9137e1123fcdf2f326282cad1b5

build system: add -fstage1/-fno-stage1 to `zig build`

So that people can start experimenting with compiling their projects
with the self-hosted compiler.

I expect this commit to be reverted after #89 is closed.

3 files changed, 44 insertions(+), 7 deletions(-)

lib
- std
  - build.zig
  - special
    build_runner.zig
src
- main.zig

lib/std/build.zig+16

...	@@ -44,6 +44,7 @@ pub const Builder = struct {	...	@@ -44,6 +44,7 @@ pub const Builder = struct {
44	/// The purpose of executing the command is for a human to read compile errors from the terminal	44	/// The purpose of executing the command is for a human to read compile errors from the terminal
45	prominent_compile_errors: bool,	45	prominent_compile_errors: bool,
46	color: enum { auto, on, off } = .auto,	46	color: enum { auto, on, off } = .auto,
		47	use_stage1: ?bool = null,
47	invalid_user_input: bool,	48	invalid_user_input: bool,
48	zig_exe: []const u8,	49	zig_exe: []const u8,
49	default_step: *Step,	50	default_step: *Step,
...	@@ -1591,6 +1592,7 @@ pub const LibExeObjStep = struct {	...	@@ -1591,6 +1592,7 @@ pub const LibExeObjStep = struct {
1591	stack_size: ?u64 = null,	1592	stack_size: ?u64 = null,
1592		1593
1593	want_lto: ?bool = null,	1594	want_lto: ?bool = null,
		1595	use_stage1: ?bool = null,
1594		1596
1595	output_path_source: GeneratedFile,	1597	output_path_source: GeneratedFile,
1596	output_lib_path_source: GeneratedFile,	1598	output_lib_path_source: GeneratedFile,
...	@@ -2338,6 +2340,20 @@ pub const LibExeObjStep = struct {	...	@@ -2338,6 +2340,20 @@ pub const LibExeObjStep = struct {
2338	try zig_args.append(@tagName(builder.color));	2340	try zig_args.append(@tagName(builder.color));
2339	}	2341	}
2340		2342
		2343	if (self.use_stage1) \|stage1\| {
		2344	if (stage1) {
		2345	try zig_args.append("-fstage1");
		2346	} else {
		2347	try zig_args.append("-fno-stage1");
		2348	}
		2349	} else if (builder.use_stage1) \|stage1\| {
		2350	if (stage1) {
		2351	try zig_args.append("-fstage1");
		2352	} else {
		2353	try zig_args.append("-fno-stage1");
		2354	}
		2355	}
		2356
2341	if (self.entry_symbol_name) \|entry\| {	2357	if (self.entry_symbol_name) \|entry\| {
2342	try zig_args.append("--entry");	2358	try zig_args.append("--entry");
2343	try zig_args.append(entry);	2359	try zig_args.append(entry);

lib/std/special/build_runner.zig+12-5

 @@ -24,19 +24,19 @@ pub fn main() !void {
     var arg_idx: usize = 1;
     const zig_exe = nextArg(args, &arg_idx) orelse {
-        std.debug.print("Expected first argument to be path to zig compiler\n", .{});
+        std.debug.print("Expected path to zig compiler\n", .{});
         return error.InvalidArgs;
     };
     const build_root = nextArg(args, &arg_idx) orelse {
-        std.debug.print("Expected second argument to be build root directory path\n", .{});
+        std.debug.print("Expected build root directory path\n", .{});
         return error.InvalidArgs;
     };
     const cache_root = nextArg(args, &arg_idx) orelse {
-        std.debug.print("Expected third argument to be cache root directory path\n", .{});
+        std.debug.print("Expected cache root directory path\n", .{});
         return error.InvalidArgs;
     };
     const global_cache_root = nextArg(args, &arg_idx) orelse {
-        std.debug.print("Expected third argument to be global cache root directory path\n", .{});
+        std.debug.print("Expected global cache root directory path\n", .{});
         return error.InvalidArgs;
     };
 @@ -181,6 +181,10 @@ pub fn main() !void {
                 builder.enable_darling = true;
             } else if (mem.eql(u8, arg, "-fno-darling")) {
                 builder.enable_darling = false;
+            } else if (mem.eql(u8, arg, "-fstage1")) {
+                builder.use_stage1 = true;
+            } else if (mem.eql(u8, arg, "-fno-stage1")) {
+                builder.use_stage1 = false;
             } else if (mem.eql(u8, arg, "--")) {
                 builder.args = argsRest(args, arg_idx);
                 break;
 @@ -302,8 +306,11 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void
     try out_stream.writeAll(
         \\
         \\Advanced Options:
+        \\  -fstage1                     Force using bootstrap compiler as the codegen backend
+        \\  -fno-stage1                  Prevent using bootstrap compiler as the codegen backend
         \\  --build-file [file]          Override path to build.zig
-        \\  --cache-dir [path]           Override path to zig cache directory
+        \\  --cache-dir [path]           Override path to local Zig cache directory
+        \\  --global-cache-dir [path]    Override path to global Zig cache directory
         \\  --zig-lib-dir [arg]          Override path to Zig lib directory
         \\  --debug-log [scope]          Enable debugging the compiler
         \\  --verbose-link               Enable compiler debug output for linking

src/main.zig+16-2

 @@ -3464,13 +3464,20 @@ pub const usage_build =
     \\   Build a project from build.zig.
     \\
     \\Options:
-    \\   -h, --help             Print this help and exit
+    \\   -fstage1                      Force using bootstrap compiler as the codegen backend
-    \\
+    \\   -fno-stage1                   Prevent using bootstrap compiler as the codegen backend
+    \\   --build-file [file]           Override path to build.zig
+    \\   --cache-dir [path]            Override path to local Zig cache directory
+    \\   --global-cache-dir [path]     Override path to global Zig cache directory
+    \\   --zig-lib-dir [arg]           Override path to Zig lib directory
+    \\   --prominent-compile-errors    Output compile errors formatted for a human to read
+    \\   -h, --help                    Print this help and exit
     \\
 ;
 pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
     var prominent_compile_errors: bool = false;
+    var use_stage1: ?bool = null;
     // We want to release all the locks before executing the child process, so we make a nice
     // big block here to ensure the cleanup gets run when we extract out our argv.
 @@ -3525,6 +3532,12 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi
                         continue;
                     } else if (mem.eql(u8, arg, "--prominent-compile-errors")) {
                         prominent_compile_errors = true;
+                    } else if (mem.eql(u8, arg, "-fstage1")) {
+                        use_stage1 = true;
+                        try child_argv.append(arg);
+                    } else if (mem.eql(u8, arg, "-fno-stage1")) {
+                        use_stage1 = false;
+                        try child_argv.append(arg);
                     }
                 }
                 try child_argv.append(arg);
 @@ -3665,6 +3678,7 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi
             .optimize_mode = .Debug,
             .self_exe_path = self_exe_path,
             .thread_pool = &thread_pool,
+            .use_stage1 = use_stage1,
         }) catch |err| {
             fatal("unable to create compilation: {s}", .{@errorName(err)});
         };