Skip to content

Commit

Permalink
Delete unnecessary command
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Simulacrum committed Jun 13, 2019
1 parent 92f5e58 commit 0e14818
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/bootstrap/tool.rs
Expand Up @@ -268,10 +268,6 @@ macro_rules! bootstrap_tool {
}

impl Tool {
pub fn get_mode(&self) -> Mode {
Mode::ToolBootstrap
}

/// Whether this tool requires LLVM to run
pub fn uses_llvm_tools(&self) -> bool {
match self {
Expand Down Expand Up @@ -659,23 +655,23 @@ impl<'a> Builder<'a> {
pub fn tool_cmd(&self, tool: Tool) -> Command {
let mut cmd = Command::new(self.tool_exe(tool));
let compiler = self.compiler(0, self.config.build);
self.prepare_tool_cmd(compiler, tool, &mut cmd);
self.prepare_tool_cmd(compiler, &mut cmd);
cmd
}

/// Prepares the `cmd` provided to be able to run the `compiler` provided.
///
/// Notably this munges the dynamic library lookup path to point to the
/// right location to run `compiler`.
fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
fn prepare_tool_cmd(&self, compiler: Compiler, cmd: &mut Command) {
let host = &compiler.host;
let mut lib_paths: Vec<PathBuf> = vec![
if compiler.stage == 0 {
self.build.rustc_snapshot_libdir()
} else {
PathBuf::from(&self.sysroot_libdir(compiler, compiler.host))
},
self.cargo_out(compiler, tool.get_mode(), *host).join("deps"),
self.cargo_out(compiler, Mode::ToolBootstrap, *host).join("deps"),
];

// On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
Expand Down

0 comments on commit 0e14818

Please sign in to comment.