File tree 2 files changed +12
-8
lines changed
2 files changed +12
-8
lines changed Original file line number Diff line number Diff line change 1
1
/target
2
2
/Cargo.lock
3
+ .idea
4
+ * .iml
Original file line number Diff line number Diff line change @@ -371,16 +371,18 @@ impl Config {
371
371
get_variable ( package, variable) . map_err ( |e| e. to_string ( ) )
372
372
}
373
373
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 > {
375
375
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) )
382
384
} else {
383
- self . env_var ( name )
385
+ self . env_var ( var_base )
384
386
}
385
387
}
386
388
You can’t perform that action at this time.
0 commit comments