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