aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-06-14 11:56:58 -0700
committerJakub Konka <kubkon@jakubkonka.com>2021-06-15 12:14:03 +0200
commitd6f27725833cfe66f83b31cfdb7557eefdba3d13 (patch)
tree8a83eac6610f7030f0cfb794407695f0f3ad0af8
parentc434a9a573292432b91974fc819bcef6a04eba3e (diff)
downloadzig-d6f27725833cfe66f83b31cfdb7557eefdba3d13.tar.gz
zig-d6f27725833cfe66f83b31cfdb7557eefdba3d13.zip
zig build: rename --lib-dir, --include-dir, --exe-dir
To --prefix-lib-dir, --prefix-include-dir, --prefix-exe-dir, respectively.
-rw-r--r--lib/std/special/build_runner.zig18
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/std/special/build_runner.zig b/lib/std/special/build_runner.zig
index 1855d3652d..06ac832270 100644
--- a/lib/std/special/build_runner.zig
+++ b/lib/std/special/build_runner.zig
@@ -89,17 +89,17 @@ pub fn main() !void {
warn("Expected argument after {s}\n\n", .{arg});
return usageAndErr(builder, false, stderr_stream);
};
- } else if (mem.eql(u8, arg, "--lib-dir")) {
+ } else if (mem.eql(u8, arg, "--prefix-lib-dir")) {
dir_list.lib_dir = nextArg(args, &arg_idx) orelse {
warn("Expected argument after {s}\n\n", .{arg});
return usageAndErr(builder, false, stderr_stream);
};
- } else if (mem.eql(u8, arg, "--exe-dir")) {
+ } else if (mem.eql(u8, arg, "--prefix-exe-dir")) {
dir_list.exe_dir = nextArg(args, &arg_idx) orelse {
warn("Expected argument after {s}\n\n", .{arg});
return usageAndErr(builder, false, stderr_stream);
};
- } else if (mem.eql(u8, arg, "--include-dir")) {
+ } else if (mem.eql(u8, arg, "--prefix-include-dir")) {
dir_list.include_dir = nextArg(args, &arg_idx) orelse {
warn("Expected argument after {s}\n\n", .{arg});
return usageAndErr(builder, false, stderr_stream);
@@ -203,13 +203,15 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void
try out_stream.writeAll(
\\
\\General Options:
+ \\ -p, --prefix [path] Override default install prefix
+ \\ --prefix-lib-dir [path] Override default library directory path
+ \\ --prefix-exe-dir [path] Override default executable directory path
+ \\ --prefix-include-dir [path] Override default include directory path
+ \\
+ \\ --search-prefix [path] Add a path to look for binaries, libraries, headers
+ \\
\\ -h, --help Print this help and exit
\\ --verbose Print commands before executing them
- \\ -p, --prefix [path] Override default install prefix
- \\ --lib-dir [path] Override default library directory path
- \\ --exe-dir [path] Override default executable directory path
- \\ --include-dir [path] Override default include directory path
- \\ --search-prefix [path] Add a path to look for binaries, libraries, headers
\\ --color [auto|off|on] Enable or disable colored error messages
\\
\\Project-Specific Options: