File tree 1 file changed +4
-2
lines changed
1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -443,12 +443,14 @@ impl Config {
443
443
fn targetted_env_var ( & self , var_base : & str ) -> Option < OsString > {
444
444
match ( env:: var ( "TARGET" ) , env:: var ( "HOST" ) ) {
445
445
( 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" } ;
447
448
let target_u = target. replace ( "-" , "_" ) ;
448
449
449
450
self . env_var_os ( & format ! ( "{}_{}" , var_base, target) )
450
451
. 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) ) )
452
454
. or_else ( || self . env_var_os ( var_base) )
453
455
}
454
456
( Err ( env:: VarError :: NotPresent ) , _) | ( _, Err ( env:: VarError :: NotPresent ) ) => {
You can’t perform that action at this time.
0 commit comments