diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-04-30 00:10:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 00:10:44 -0400 |
| commit | 4e07755ce705066cdb4e20feebc5010c7e3e6d12 (patch) | |
| tree | c1676ae89de0a886055c730a17c1336cd55f372b /lib | |
| parent | 585479500e1941da25bcc4c55a4c3abc69fec031 (diff) | |
| parent | 5079d11b213a02e9d9465f3371d0833021cfc636 (diff) | |
| download | zig-4e07755ce705066cdb4e20feebc5010c7e3e6d12.tar.gz zig-4e07755ce705066cdb4e20feebc5010c7e3e6d12.zip | |
Merge pull request #8638 from ifreund/build-default-prefix
std/build: change default install prefix to zig-out
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/build.zig | 3 | ||||
| -rw-r--r-- | lib/std/special/build_runner.zig | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/std/build.zig b/lib/std/build.zig index fce3a0bceb..1811073279 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -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; diff --git a/lib/std/special/build_runner.zig b/lib/std/special/build_runner.zig index 70aa3c8dc6..c6185ef093 100644 --- a/lib/std/special/build_runner.zig +++ b/lib/std/special/build_runner.zig @@ -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 \\ |