| author |  Isaac Freund <mail@isaacfreund.com> 2021-06-25 14:04:38+02:00 |
| committer | Isaac Freund <mail@isaacfreund.com> 2021-06-25 19:13:43+02:00 |
| log | f9171bf54295df0bd8f4dbe1ab9698e5940ba445 |
| tree | 9615e89b6c660ed3b3598f9bc54a7986c08975d3 |
| parent | 260c5aed86d662d2e2bd03c06d123bef9455053d |
| signature | Commit is signed but in an unrecognized format. |
std/build: add --sysroot general option
2 files changed, 12 insertions(+), 0 deletions(-)
lib
std
- build.zig
special
lib/std/build.zig+5
| ... | ... | @@ -57,6 +57,7 @@ pub const Builder = struct { |
| 57 | 57 | exe_dir: []const u8, |
| 58 | 58 | h_dir: []const u8, |
| 59 | 59 | install_path: []const u8, |
| 60 | sysroot: ?[]const u8 = null, | |
| 60 | 61 | search_prefixes: ArrayList([]const u8), |
| 61 | 62 | libc_file: ?[]const u8 = null, |
| 62 | 63 | installed_files: ArrayList(InstalledFile), |
| ... | ... | @@ -2701,6 +2702,10 @@ pub const LibExeObjStep = struct { |
| 2701 | 2702 | } |
| 2702 | 2703 | } |
| 2703 | 2704 | |
| 2705 | if (builder.sysroot) |sysroot| { | |
| 2706 | try zig_args.appendSlice(&[_][]const u8{ "--sysroot", sysroot }); | |
| 2707 | } | |
| 2708 | ||
| 2704 | 2709 | for (builder.search_prefixes.items) |search_prefix| { |
| 2705 | 2710 | try zig_args.append("-L"); |
| 2706 | 2711 | try zig_args.append(try fs.path.join(builder.allocator, &[_][]const u8{ |
lib/std/special/build_runner.zig+7
| ... | ... | @@ -104,6 +104,12 @@ pub fn main() !void { |
| 104 | 104 | warn("Expected argument after {s}\n\n", .{arg}); |
| 105 | 105 | return usageAndErr(builder, false, stderr_stream); |
| 106 | 106 | }; |
| 107 | } else if (mem.eql(u8, arg, "--sysroot")) { | |
| 108 | const sysroot = nextArg(args, &arg_idx) orelse { | |
| 109 | warn("Expected argument after --sysroot\n\n", .{}); | |
| 110 | return usageAndErr(builder, false, stderr_stream); | |
| 111 | }; | |
| 112 | builder.sysroot = sysroot; | |
| 107 | 113 | } else if (mem.eql(u8, arg, "--search-prefix")) { |
| 108 | 114 | const search_prefix = nextArg(args, &arg_idx) orelse { |
| 109 | 115 | warn("Expected argument after --search-prefix\n\n", .{}); |
| ... | ... | @@ -214,6 +220,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void |
| 214 | 220 | \\ --prefix-exe-dir [path] Override default executable directory path |
| 215 | 221 | \\ --prefix-include-dir [path] Override default include directory path |
| 216 | 222 | \\ |
| 223 | \\ --sysroot [path] Set the system root directory (usually /) | |
| 217 | 224 | \\ --search-prefix [path] Add a path to look for binaries, libraries, headers |
| 218 | 225 | \\ --libc [file] Provide a file which specifies libc paths |
| 219 | 226 | \\ |