srctree

Andrew Kelley parent 58547950 5079d11b 4e07755c
Merge pull request #8638 from ifreund/build-default-prefix

std/build: change default install prefix to zig-out
.gitignore added: 9, removed: 7, total 2
@@ -10,6 +10,7 @@
# -andrewrk
 
zig-cache/
zig-out/
/release/
/debug/
/build/
 
lib/std/build.zig added: 9, removed: 7, total 2
@@ -195,7 +195,8 @@ pub const Builder = struct {
self.install_prefix = install_prefix orelse "/usr";
self.install_path = fs.path.join(self.allocator, &[_][]const u8{ dest_dir, self.install_prefix }) catch unreachable;
} else {
self.install_prefix = install_prefix orelse self.cache_root;
self.install_prefix = install_prefix orelse
(fs.path.join(self.allocator, &[_][]const u8{ self.build_root, "zig-out" }) catch unreachable);
self.install_path = self.install_prefix;
}
self.lib_dir = fs.path.join(self.allocator, &[_][]const u8{ self.install_path, "lib" }) catch unreachable;
 
lib/std/special/build_runner.zig added: 9, removed: 7, total 2
@@ -82,9 +82,9 @@ pub fn main() !void {
builder.verbose = true;
} else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
return usage(builder, false, stdout_stream);
} else if (mem.eql(u8, arg, "--prefix")) {
} else if (mem.eql(u8, arg, "-p") or mem.eql(u8, arg, "--prefix")) {
install_prefix = nextArg(args, &arg_idx) orelse {
warn("Expected argument after --prefix\n\n", .{});
warn("Expected argument after {s}\n\n", .{arg});
return usageAndErr(builder, false, stderr_stream);
};
} else if (mem.eql(u8, arg, "--search-prefix")) {
@@ -188,7 +188,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void
\\General Options:
\\ -h, --help Print this help and exit
\\ --verbose Print commands before executing them
\\ --prefix [path] Override default install prefix
\\ -p, --prefix [path] Override default install prefix
\\ --search-prefix [path] Add a path to look for binaries, libraries, headers
\\ --color [auto|off|on] Enable or disable colored error messages
\\