Skip to content

Commit dcd1021

Browse files
committed
Changed PKG_CONFIG env variable name
1 parent 040fed2 commit dcd1021

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
/target
22
/Cargo.lock
3+
.idea
4+
*.iml

src/lib.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,16 +371,18 @@ impl Config {
371371
get_variable(package, variable).map_err(|e| e.to_string())
372372
}
373373

374-
fn targetted_env_var(&self, name: &str) -> Result<String, env::VarError> {
374+
fn targetted_env_var(&self, var_base: &str) -> Result<String, env::VarError> {
375375
if let Ok(target) = env::var("TARGET") {
376-
let targetted_name = format!("{}_{}", envify(&target), name);
377-
match self.env_var(&targetted_name) {
378-
Ok(value) => { Ok(value) },
379-
Err(env::VarError::NotPresent) => { self.env_var(name) },
380-
Err(e) => { Err(e) }
381-
}
376+
let host = env::var("HOST")?;
377+
let kind = if host == target { "HOST" } else { "TARGET" };
378+
let target_u = target.replace("-", "_");
379+
380+
self.env_var(&format!("{}_{}", var_base, target))
381+
.or_else(|_| self.env_var(&format!("{}_{}", var_base, target_u)))
382+
.or_else(|_| self.env_var(&format!("{}_{}", kind, var_base)))
383+
.or_else(|_| self.env_var(var_base))
382384
} else {
383-
self.env_var(name)
385+
self.env_var(var_base)
384386
}
385387
}
386388

0 commit comments

Comments
 (0)