File tree Expand file tree Collapse file tree 1 file changed +10
-8
lines changed Expand file tree Collapse file tree 1 file changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -1008,14 +1008,16 @@ fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: RunnerPhas
1008
1008
// Set missing env vars. We prefer build-time env vars over run-time ones; see
1009
1009
// <https://github.com/rust-lang/miri/issues/1661> for the kind of issue that fixes.
1010
1010
for ( name, val) in info. env {
1011
- if verbose > 0 {
1012
- if let Some ( old_val) = env:: var_os ( & name) {
1013
- if old_val != val {
1014
- eprintln ! (
1015
- "[cargo-miri runner] Overwriting run-time env var {:?}={:?} with build-time value {:?}" ,
1016
- name, old_val, val
1017
- ) ;
1018
- }
1011
+ if let Some ( old_val) = env:: var_os ( & name) {
1012
+ if old_val == val {
1013
+ // This one did not actually change, no need to re-set it.
1014
+ // (This keeps the `debug_cmd` below more manageable.)
1015
+ continue ;
1016
+ } else if verbose > 0 {
1017
+ eprintln ! (
1018
+ "[cargo-miri runner] Overwriting run-time env var {:?}={:?} with build-time value {:?}" ,
1019
+ name, old_val, val
1020
+ ) ;
1019
1021
}
1020
1022
}
1021
1023
cmd. env ( name, val) ;
You can’t perform that action at this time.
0 commit comments