diff options
| author | Isaac Freund <ifreund@ifreund.xyz> | 2021-06-13 04:49:54 +0000 |
|---|---|---|
| committer | Veikka Tuominen <git@vexu.eu> | 2021-06-15 08:01:26 +0300 |
| commit | db08d4c3d63cfee9da0e4c6825c906d4083e8303 (patch) | |
| tree | 479b352f06a05d36421892de708559cc68f2cced /lib/std | |
| parent | 97946e2a41a6a44ed376b57b32a19ce9d85f0bc2 (diff) | |
| download | zig-db08d4c3d63cfee9da0e4c6825c906d4083e8303.tar.gz zig-db08d4c3d63cfee9da0e4c6825c906d4083e8303.zip | |
zig build: add --libc general option
This new option sets a default libc paths file to be used for all
LibExeObjSteps. Setting LibExeObjStep.libc_file overrides this default.
This is required to allow users to cross compile projects linking system
libraries without needing to patch the build.zig.
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/build.zig | 4 | ||||
| -rw-r--r-- | lib/std/special/build_runner.zig | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/std/build.zig b/lib/std/build.zig index ed9e5e4ece..96af4a3071 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -58,6 +58,7 @@ pub const Builder = struct { h_dir: []const u8, install_path: []const u8, search_prefixes: ArrayList([]const u8), + libc_file: ?[]const u8 = null, installed_files: ArrayList(InstalledFile), build_root: []const u8, cache_root: []const u8, @@ -2474,6 +2475,9 @@ pub const LibExeObjStep = struct { if (self.libc_file) |libc_file| { try zig_args.append("--libc"); try zig_args.append(libc_file.getPath(self.builder)); + } else if (builder.libc_file) |libc_file| { + try zig_args.append("--libc"); + try zig_args.append(libc_file); } switch (self.build_mode) { diff --git a/lib/std/special/build_runner.zig b/lib/std/special/build_runner.zig index 06ac832270..510dd578c3 100644 --- a/lib/std/special/build_runner.zig +++ b/lib/std/special/build_runner.zig @@ -110,6 +110,12 @@ pub fn main() !void { return usageAndErr(builder, false, stderr_stream); }; builder.addSearchPrefix(search_prefix); + } else if (mem.eql(u8, arg, "--libc")) { + const libc_file = nextArg(args, &arg_idx) orelse { + warn("Expected argument after --libc\n\n", .{}); + return usageAndErr(builder, false, stderr_stream); + }; + builder.libc_file = libc_file; } else if (mem.eql(u8, arg, "--color")) { const next_arg = nextArg(args, &arg_idx) orelse { warn("expected [auto|on|off] after --color", .{}); @@ -209,6 +215,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void \\ --prefix-include-dir [path] Override default include directory path \\ \\ --search-prefix [path] Add a path to look for binaries, libraries, headers + \\ --libc [file] Provide a file which specifies libc paths \\ \\ -h, --help Print this help and exit \\ --verbose Print commands before executing them |