Skip to content

Commit

Permalink
std.Build: revert --host-target, --host-cpu, --host-dynamic-linker
Browse files Browse the repository at this point in the history 
This is a partial revert of 105db13.

As we learned from Void Linux packaging, these options are not actually
helpful since the distribution package manager may very well want to
cross-compile the packages that it is building.

So, let's not overcomplicate things. There are already the standard
options: -Dtarget, -Dcpu, and -Ddynamic-linker.

These options are generally provided when the project generates machine
code artifacts, however, there may be a project that does no such thing,
in which case it makes sense for these options to be missing. The Zig
Build System is a general-purpose build system, after all.
  • Loading branch information
@andrewrk
andrewrk committed Apr 18, 2024
1 parent 21a6a1b commit 22a97cd
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 68 deletions.
22 changes: 4 additions & 18 deletions lib/compiler/build_runner.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ pub fn main() !void {
.zig_exe = zig_exe,
.env_map = try process.getEnvMap(arena),
.global_cache_root = global_cache_directory,
.host = .{
.query = .{},
.result = try std.zig.system.resolveTargetQuery(.{}),
},
};

graph.cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
Expand Down Expand Up @@ -142,12 +146,6 @@ pub fn main() !void {
arg, text,
});
};
} else if (mem.eql(u8, arg, "--host-target")) {
graph.host_query_options.arch_os_abi = nextArgOrFatal(args, &arg_idx);
} else if (mem.eql(u8, arg, "--host-cpu")) {
graph.host_query_options.cpu_features = nextArgOrFatal(args, &arg_idx);
} else if (mem.eql(u8, arg, "--host-dynamic-linker")) {
graph.host_query_options.dynamic_linker = nextArgOrFatal(args, &arg_idx);
} else if (mem.eql(u8, arg, "--prefix-lib-dir")) {
dir_list.lib_dir = nextArgOrFatal(args, &arg_idx);
} else if (mem.eql(u8, arg, "--prefix-exe-dir")) {
Expand Down Expand Up @@ -283,14 +281,6 @@ pub fn main() !void {
}
}

const host_query = std.Build.parseTargetQuery(graph.host_query_options) catch |err| switch (err) {
error.ParseFailed => process.exit(1),
};
builder.host = .{
.query = .{},
.result = try std.zig.system.resolveTargetQuery(host_query),
};

const stderr = std.io.getStdErr();
const ttyconf = get_tty_conf(color, stderr);
switch (ttyconf) {
Expand Down Expand Up @@ -1171,10 +1161,6 @@ fn usage(b: *std.Build, out_stream: anytype) !void {
\\ --sysroot [path] Set the system root directory (usually /)
\\ --libc [file] Provide a file which specifies libc paths
\\
\\ --host-target [triple] Use the provided target as the host
\\ --host-cpu [cpu] Use the provided CPU as the host
\\ --host-dynamic-linker [path] Use the provided dynamic linker as the host
\\
\\ --system [pkgdir] Disable package fetching; enable all integrations
\\ -fsys=[name] Enable a system integration
\\ -fno-sys=[name] Disable a system integration
Expand Down
16 changes: 6 additions & 10 deletions lib/std/Build.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ enable_wine: bool = false,
/// that contains the path `aarch64-linux-gnu/lib/ld-linux-aarch64.so.1`.
glibc_runtimes_dir: ?[]const u8 = null,

/// Information about the native target. Computed before build() is invoked.
/// Deprecated. Use `b.graph.host`.
host: ResolvedTarget,

dep_prefix: []const u8 = "",
Expand Down Expand Up @@ -118,8 +118,9 @@ pub const Graph = struct {
zig_exe: [:0]const u8,
env_map: EnvMap,
global_cache_root: Cache.Directory,
host_query_options: std.Target.Query.ParseOptions = .{},
needed_lazy_dependencies: std.StringArrayHashMapUnmanaged(void) = .{},
/// Information about the native target. Computed before build() is invoked.
host: ResolvedTarget,
};

const AvailableDeps = []const struct { []const u8, []const u8 };
Expand Down Expand Up @@ -297,7 +298,7 @@ pub fn create(
.zig_lib_dir = null,
.install_path = undefined,
.args = null,
.host = undefined,
.host = graph.host,
.modules = std.StringArrayHashMap(*Module).init(arena),
.named_writefiles = std.StringArrayHashMap(*Step.WriteFile).init(arena),
.initialized_deps = initialized_deps,
Expand Down Expand Up @@ -2489,14 +2490,9 @@ pub const ResolvedTarget = struct {
/// various parts of the API.
pub fn resolveTargetQuery(b: *Build, query: Target.Query) ResolvedTarget {
if (query.isNative()) {
var adjusted = b.host;
if (query.ofmt) |ofmt| {
adjusted.query.ofmt = ofmt;
adjusted.result.ofmt = ofmt;
}
return adjusted;
// Hot path. This is faster than querying the native CPU and OS again.
return b.graph.host;
}

return .{
.query = query,
.result = std.zig.system.resolveTargetQuery(query) catch
Expand Down
10 changes: 0 additions & 10 deletions lib/std/Build/Step/Compile.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,16 +1011,6 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
};
try zig_args.append(cmd);

if (!mem.eql(u8, b.graph.host_query_options.arch_os_abi, "native")) {
try zig_args.appendSlice(&.{ "--host-target", b.graph.host_query_options.arch_os_abi });
}
if (b.graph.host_query_options.cpu_features) |cpu| {
try zig_args.appendSlice(&.{ "--host-cpu", cpu });
}
if (b.graph.host_query_options.dynamic_linker) |dl| {
try zig_args.appendSlice(&.{ "--host-dynamic-linker", dl });
}

if (b.reference_trace) |some| {
try zig_args.append(try std.fmt.allocPrint(arena, "-freference-trace={d}", .{some}));
}
Expand Down
9 changes: 4 additions & 5 deletions lib/std/Build/Step/Options.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,10 @@ test Options {
.zig_exe = "test",
.env_map = std.process.EnvMap.init(arena.allocator()),
.global_cache_root = .{ .path = "test", .handle = std.fs.cwd() },
.host = .{
.query = .{},
.result = try std.zig.system.resolveTargetQuery(.{}),
},
};

var builder = try std.Build.create(
Expand All @@ -525,11 +529,6 @@ test Options {
&.{},
);

builder.host = .{
.query = .{},
.result = try std.zig.system.resolveTargetQuery(.{}),
};

const options = builder.addOptions();

const KeywordEnum = enum {
Expand Down
11 changes: 7 additions & 4 deletions lib/std/Target/Query.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,16 @@ pub fn isNativeAbi(self: Query) bool {
return self.os_tag == null and self.abi == null;
}

pub fn isNative(self: Query) bool {
pub fn isNativeTriple(self: Query) bool {
return self.isNativeCpu() and self.isNativeOs() and self.isNativeAbi();
}

pub fn isNative(self: Query) bool {
return self.isNativeTriple() and self.ofmt == null;
}

pub fn canDetectLibC(self: Query) bool {
if (self.isNative()) return true;
if (self.isNativeOs()) return true;
if (self.os_tag) |os| {
if (builtin.os.tag == .macos and os.isDarwin()) return true;
if (os == .linux and self.abi == .android) return true;
Expand All @@ -386,9 +390,8 @@ fn formatVersion(version: SemanticVersion, writer: anytype) !void {
}

pub fn zigTriple(self: Query, allocator: Allocator) Allocator.Error![]u8 {
if (self.isNative()) {
if (self.isNativeTriple())
return allocator.dupe(u8, "native");
}

const arch_name = if (self.cpu_arch) |arch| @tagName(arch) else "native";
const os_name = if (self.os_tag) |os_tag| @tagName(os_tag) else "native";
Expand Down
22 changes: 1 addition & 21 deletions src/main.zig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,9 +985,6 @@ fn buildOutputType(
.libc_paths_file = try EnvVar.ZIG_LIBC.get(arena),
.link_objects = .{},
.native_system_include_paths = &.{},
.host_triple = null,
.host_cpu = null,
.host_dynamic_linker = null,
};

// before arg parsing, check for the NO_COLOR environment variable
Expand Down Expand Up @@ -1285,12 +1282,6 @@ fn buildOutputType(
mod_opts.optimize_mode = parseOptimizeMode(arg["-O".len..]);
} else if (mem.eql(u8, arg, "--dynamic-linker")) {
create_module.dynamic_linker = args_iter.nextOrFatal();
} else if (mem.eql(u8, arg, "--host-target")) {
create_module.host_triple = args_iter.nextOrFatal();
} else if (mem.eql(u8, arg, "--host-cpu")) {
create_module.host_cpu = args_iter.nextOrFatal();
} else if (mem.eql(u8, arg, "--host-dynamic-linker")) {
create_module.host_dynamic_linker = args_iter.nextOrFatal();
} else if (mem.eql(u8, arg, "--sysroot")) {
const next_arg = args_iter.nextOrFatal();
create_module.sysroot = next_arg;
Expand Down Expand Up @@ -3521,9 +3512,6 @@ const CreateModule = struct {
each_lib_rpath: ?bool,
libc_paths_file: ?[]const u8,
link_objects: std.ArrayListUnmanaged(Compilation.LinkObject),
host_triple: ?[]const u8,
host_cpu: ?[]const u8,
host_dynamic_linker: ?[]const u8,
};

fn createModule(
Expand Down Expand Up @@ -3605,15 +3593,7 @@ fn createModule(
}

const target_query = std.zig.parseTargetQueryOrReportFatalError(arena, target_parse_options);
const adjusted_target_query = a: {
if (!target_query.isNative()) break :a target_query;
if (create_module.host_triple) |triple| target_parse_options.arch_os_abi = triple;
if (create_module.host_cpu) |cpu| target_parse_options.cpu_features = cpu;
if (create_module.host_dynamic_linker) |dl| target_parse_options.dynamic_linker = dl;
break :a std.zig.parseTargetQueryOrReportFatalError(arena, target_parse_options);
};

const target = std.zig.resolveTargetQueryOrFatal(adjusted_target_query);
const target = std.zig.resolveTargetQueryOrFatal(target_query);
break :t .{
.result = target,
.is_native_os = target_query.isNativeOs(),
Expand Down

0 comments on commit 22a97cd

Please sign in to comment.