Skip to content

Commit 75ff726

Browse files
authoredOct 29, 2022
Support PKG_CONFIG_PATH_FOR_BUILD env var
Fix rust-lang#139
1 parent 947aea5 commit 75ff726

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed
 

Diff for: ‎src/lib.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,14 @@ impl Config {
443443
fn targetted_env_var(&self, var_base: &str) -> Option<OsString> {
444444
match (env::var("TARGET"), env::var("HOST")) {
445445
(Ok(target), Ok(host)) => {
446-
let kind = if host == target { "HOST" } else { "TARGET" };
446+
let kind_suffix = if host == target { "_FOR_BUILD" } else { "" };
447+
let kind_prefix = if host == target { "HOST" } else { "TARGET" };
447448
let target_u = target.replace("-", "_");
448449

449450
self.env_var_os(&format!("{}_{}", var_base, target))
450451
.or_else(|| self.env_var_os(&format!("{}_{}", var_base, target_u)))
451-
.or_else(|| self.env_var_os(&format!("{}_{}", kind, var_base)))
452+
.or_else(|| self.env_var_os(&format!("{}_{}", var_base, kind_suffix)))
453+
.or_else(|| self.env_var_os(&format!("{}_{}", kind_prefix, var_base)))
452454
.or_else(|| self.env_var_os(var_base))
453455
}
454456
(Err(env::VarError::NotPresent), _) | (_, Err(env::VarError::NotPresent)) => {

0 commit comments

Comments
 (0)