Skip to content

std.Build.Dependency: add optional~ functions #21841

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

Open
dasimmet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

std.Build.Dependency: add optional~ functions #21841

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions lib/std/Build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,7 +2104,7 @@ pub fn getInstallPath(b: *Build, dir: InstallDir, dest_rel_path: []const u8) []c
pub const Dependency = struct {
builder: *Build,

pub fn artifact(d: *Dependency, name: []const u8) *Step.Compile {
pub fn optionalArtifact(d: *Dependency, name: []const u8) ?*Step.Compile {
var found: ?*Step.Compile = null;
for (d.builder.install_tls.step.dependencies.items) |dep_step| {
const inst = dep_step.cast(Step.InstallArtifact) orelse continue;
Expand All @@ -2113,7 +2113,11 @@ pub const Dependency = struct {
found = inst.artifact;
}
}
return found orelse {
return found;
}

pub fn artifact(d: *Dependency, name: []const u8) *Step.Compile {
return d.lazyArtifact(name) orelse {
for (d.builder.install_tls.step.dependencies.items) |dep_step| {
const inst = dep_step.cast(Step.InstallArtifact) orelse continue;
log.info("available artifact: '{s}'", .{inst.artifact.name});
Expand All @@ -2122,18 +2126,30 @@ pub const Dependency = struct {
};
}

pub fn optionalModule(d: *Dependency, name: []const u8) ?*Module {
return d.builder.modules.get(name);
}

pub fn module(d: *Dependency, name: []const u8) *Module {
return d.builder.modules.get(name) orelse {
panic("unable to find module '{s}'", .{name});
};
}

pub fn optionalNamedWriteFiles(d: *Dependency, name: []const u8) ?*Step.WriteFile {
return d.builder.named_writefiles.get(name);
}

pub fn namedWriteFiles(d: *Dependency, name: []const u8) *Step.WriteFile {
return d.builder.named_writefiles.get(name) orelse {
panic("unable to find named writefiles '{s}'", .{name});
};
}

pub fn optionalNamedLazyPath(d: *Dependency, name: []const u8) ?LazyPath {
return d.builder.named_lazy_paths.get(name);
}

pub fn namedLazyPath(d: *Dependency, name: []const u8) LazyPath {
return d.builder.named_lazy_paths.get(name) orelse {
panic("unable to find named lazypath '{s}'", .{name});
Expand Down