Skip to content
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

feat: Use vitasdk's pkg-config wrapper so that VITASDK variable gets set #28

Merged
merged 3 commits into from
Feb 16, 2025
Merged

feat: Use vitasdk's pkg-config wrapper so that VITASDK variable gets set #28

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9313919
feat: Use vitasdk's pkg-config wrapper so that VITASDK variable gets set
pheki Feb 4, 2025
cae43c6
fix: Clippy lint
pheki Feb 4, 2025
e63b70b
chore: Remove unused PKG_CONFIG_SYSROOT_DIR
pheki Feb 8, 2025
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
6 changes: 2 additions & 4 deletions src/commands/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl Executor for Build {
}
}

impl<'a> BuildContext<'a> {
impl BuildContext<'_> {
fn build_elf(&self) -> anyhow::Result<Vec<ExecutableArtifact>> {
let cargo = env::var("CARGO").unwrap_or_else(|_| "cargo".to_string());

Expand Down Expand Up @@ -233,9 +233,7 @@ impl<'a> BuildContext<'a> {
.pass_path_env("OPENSSL_INCLUDE_DIR", || {
self.sdk("arm-vita-eabi").join("include")
})
.pass_path_env("PKG_CONFIG_PATH", || {
self.sdk("arm-vita-eabi").join("lib").join("pkgconfig")
})
.pass_path_env("PKG_CONFIG", || self.sdk_binary("arm-vita-eabi-pkg-config"))
.pass_env("PKG_CONFIG_SYSROOT_DIR", || &self.sdk)
.env("VITASDK", &self.sdk)
.arg("build")
Expand Down