File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -816,6 +816,8 @@ def bootstrap(help_triggered):
816
816
env ["BOOTSTRAP_PYTHON" ] = sys .executable
817
817
env ["BUILD_DIR" ] = build .build_dir
818
818
env ["RUSTC_BOOTSTRAP" ] = '1'
819
+ env ["CARGO" ] = build .cargo ()
820
+ env ["RUSTC" ] = build .rustc ()
819
821
run (args , env = env , verbose = build .verbose )
820
822
821
823
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ use std::cmp;
23
23
24
24
use num_cpus;
25
25
use toml;
26
- use util:: exe;
27
26
use cache:: { INTERNER , Interned } ;
28
27
use flags:: Flags ;
29
28
pub use flags:: Subcommand ;
@@ -367,9 +366,8 @@ impl Config {
367
366
config. src = Config :: path_from_python ( "SRC" ) ;
368
367
config. out = Config :: path_from_python ( "BUILD_DIR" ) ;
369
368
370
- let stage0_root = config. out . join ( & config. build ) . join ( "stage0/bin" ) ;
371
- config. initial_rustc = stage0_root. join ( exe ( "rustc" , & config. build ) ) ;
372
- config. initial_cargo = stage0_root. join ( exe ( "cargo" , & config. build ) ) ;
369
+ config. initial_rustc = Config :: path_from_python ( "RUSTC" ) ;
370
+ config. initial_cargo = Config :: path_from_python ( "CARGO" ) ;
373
371
374
372
config
375
373
}
You can’t perform that action at this time.
0 commit comments