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

Jump to bottom

Support PKG_CONFIG_PATH_FOR_BUILD env var #140

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support PKG_CONFIG_PATH_FOR_BUILD env var #140

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ff726
Support `PKG_CONFIG_PATH_FOR_BUILD` env var
Ericson2314 Oct 29, 2022
e73b769
Update src/lib.rs
Ericson2314 Nov 16, 2022
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: 4 additions & 2 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,14 @@ impl Config {
fn targetted_env_var(&self, var_base: &str) -> Option<OsString> {
match (env::var("TARGET"), env::var("HOST")) {
(Ok(target), Ok(host)) => {
let kind = if host == target { "HOST" } else { "TARGET" };
let kind_suffix = if host == target { "_FOR_BUILD" } else { "" };
let kind_prefix = if host == target { "HOST" } else { "TARGET" };
let target_u = target.replace("-", "_");

self.env_var_os(&format!("{}_{}", var_base, target))
.or_else(|| self.env_var_os(&format!("{}_{}", var_base, target_u)))
.or_else(|| self.env_var_os(&format!("{}_{}", kind, var_base)))
.or_else(|| self.env_var_os(&format!("{}_{}", var_base, kind_suffix)))
Ericson2314 marked this conversation as resolved.
Show resolved Hide resolved
.or_else(|| self.env_var_os(&format!("{}_{}", kind_prefix, var_base)))
.or_else(|| self.env_var_os(var_base))
}
(Err(env::VarError::NotPresent), _) | (_, Err(env::VarError::NotPresent)) => {
Expand Down