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