@@ -268,10 +268,6 @@ macro_rules! bootstrap_tool {
268
268
}
269
269
270
270
impl Tool {
271
- pub fn get_mode( & self ) -> Mode {
272
- Mode :: ToolBootstrap
273
- }
274
-
275
271
/// Whether this tool requires LLVM to run
276
272
pub fn uses_llvm_tools( & self ) -> bool {
277
273
match self {
@@ -659,23 +655,23 @@ impl<'a> Builder<'a> {
659
655
pub fn tool_cmd ( & self , tool : Tool ) -> Command {
660
656
let mut cmd = Command :: new ( self . tool_exe ( tool) ) ;
661
657
let compiler = self . compiler ( 0 , self . config . build ) ;
662
- self . prepare_tool_cmd ( compiler, tool , & mut cmd) ;
658
+ self . prepare_tool_cmd ( compiler, & mut cmd) ;
663
659
cmd
664
660
}
665
661
666
662
/// Prepares the `cmd` provided to be able to run the `compiler` provided.
667
663
///
668
664
/// Notably this munges the dynamic library lookup path to point to the
669
665
/// right location to run `compiler`.
670
- fn prepare_tool_cmd ( & self , compiler : Compiler , tool : Tool , cmd : & mut Command ) {
666
+ fn prepare_tool_cmd ( & self , compiler : Compiler , cmd : & mut Command ) {
671
667
let host = & compiler. host ;
672
668
let mut lib_paths: Vec < PathBuf > = vec ! [
673
669
if compiler. stage == 0 {
674
670
self . build. rustc_snapshot_libdir( )
675
671
} else {
676
672
PathBuf :: from( & self . sysroot_libdir( compiler, compiler. host) )
677
673
} ,
678
- self . cargo_out( compiler, tool . get_mode ( ) , * host) . join( "deps" ) ,
674
+ self . cargo_out( compiler, Mode :: ToolBootstrap , * host) . join( "deps" ) ,
679
675
] ;
680
676
681
677
// On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
0 commit comments