Skip to content

std.Build: remove deprecated b.host in favor of b.graph.host #20237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 8, 2024
Merged

std.Build: remove deprecated b.host in favor of b.graph.host #20237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0520555
std.Build: remove deprecated b.host in favor of b.graph.host
der-teufel-programming Jun 8, 2024
68ed364
std.Build.Step.Run: remove deprecated b.host in favor of b.graph.host
der-teufel-programming Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/std/Build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,7 @@ pub fn addTest(b: *Build, options: TestOptions) *Step.Compile {
.kind = .@"test",
.root_module = .{
.root_source_file = options.root_source_file,
.target = options.target orelse b.host,
.target = options.target orelse b.graph.host,
.optimize = options.optimize,
.link_libc = options.link_libc,
.single_threaded = options.single_threaded,
Expand Down Expand Up @@ -1711,7 +1711,7 @@ pub fn fmt(b: *Build, comptime format: []const u8, args: anytype) []u8 {

pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 {
// TODO report error for ambiguous situations
const exe_extension = b.host.result.exeFileExt();
const exe_extension = b.graph.host.result.exeFileExt();
for (b.search_prefixes.items) |search_prefix| {
for (names) |name| {
if (fs.path.isAbsolute(name)) {
Expand Down
8 changes: 4 additions & 4 deletions lib/std/Build/Step/Run.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ fn runCommand(
const need_cross_glibc = exe.rootModuleTarget().isGnuLibC() and
exe.is_linking_libc;
const other_target = exe.root_module.resolved_target.?.result;
switch (std.zig.system.getExternalExecutor(b.host.result, &other_target, .{
switch (std.zig.system.getExternalExecutor(b.graph.host.result, &other_target, .{
.qemu_fixes_dl = need_cross_glibc and b.glibc_runtimes_dir != null,
.link_libc = exe.is_linking_libc,
})) {
Expand Down Expand Up @@ -996,7 +996,7 @@ fn runCommand(
.bad_dl => |foreign_dl| {
if (allow_skip) return error.MakeSkipped;

const host_dl = b.host.result.dynamic_linker.get() orelse "(none)";
const host_dl = b.graph.host.result.dynamic_linker.get() orelse "(none)";

return step.fail(
\\the host system is unable to execute binaries from the target
Expand All @@ -1008,7 +1008,7 @@ fn runCommand(
.bad_os_or_cpu => {
if (allow_skip) return error.MakeSkipped;

const host_name = try b.host.result.zigTriple(b.allocator);
const host_name = try b.graph.host.result.zigTriple(b.allocator);
const foreign_name = try exe.rootModuleTarget().zigTriple(b.allocator);

return step.fail("the host system ({s}) is unable to execute binaries from the target ({s})", .{
Expand Down Expand Up @@ -1564,7 +1564,7 @@ fn failForeign(
return error.MakeSkipped;

const b = run.step.owner;
const host_name = try b.host.result.zigTriple(b.allocator);
const host_name = try b.graph.host.result.zigTriple(b.allocator);
const foreign_name = try exe.rootModuleTarget().zigTriple(b.allocator);

return run.step.fail(
Expand Down