@@ -3606,8 +3606,9 @@ impl<'test> TestCx<'test> {
3606
3606
3607
3607
// FIXME(jieyouxu): explain what the hecc we are doing here.
3608
3608
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
3609
- let mut cmd = Command :: new ( & self . config . rustc_path ) ;
3610
- cmd. arg ( "-o" )
3609
+ let mut rustc = Command :: new ( & self . config . rustc_path ) ;
3610
+ rustc
3611
+ . arg ( "-o" )
3611
3612
. arg ( & recipe_bin)
3612
3613
. arg ( format ! ( "-Ldependency={}" , & support_lib_path. parent( ) . unwrap( ) . to_string_lossy( ) ) )
3613
3614
. arg ( format ! ( "-Ldependency={}" , & support_lib_deps. to_string_lossy( ) ) )
@@ -3628,7 +3629,7 @@ impl<'test> TestCx<'test> {
3628
3629
3629
3630
// In test code we want to be very pedantic about values being silently discarded that are
3630
3631
// annotated with `#[must_use]`.
3631
- cmd . arg ( "-Dunused_must_use" ) ;
3632
+ rustc . arg ( "-Dunused_must_use" ) ;
3632
3633
3633
3634
// FIXME(jieyouxu): explain this!
3634
3635
if std:: env:: var_os ( "COMPILETEST_FORCE_STAGE0" ) . is_some ( ) {
@@ -3637,10 +3638,10 @@ impl<'test> TestCx<'test> {
3637
3638
debug ! ( ?stage0_sysroot) ;
3638
3639
debug ! ( exists = stage0_sysroot. exists( ) ) ;
3639
3640
3640
- cmd . arg ( "--sysroot" ) . arg ( & stage0_sysroot) ;
3641
+ rustc . arg ( "--sysroot" ) . arg ( & stage0_sysroot) ;
3641
3642
}
3642
3643
3643
- let res = self . run_command_to_procres ( & mut cmd ) ;
3644
+ let res = self . run_command_to_procres ( & mut rustc ) ;
3644
3645
if !res. status . success ( ) {
3645
3646
self . fatal_proc_rec ( "run-make test failed: could not build `rmake.rs` recipe" , & res) ;
3646
3647
}
0 commit comments