From a2c2ed3c0cba4485d97219c2f4e25f0e4f7654d4 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 3 Jun 2018 13:56:58 +0200 Subject: [PATCH] use rustc version as llvm-tools version --- src/bootstrap/lib.rs | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index cb135ad6f352..5bb9584a8da1 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -958,21 +958,24 @@ impl Build { } fn llvm_tools_vers(&self) -> String { - let stdout = build_helper::output( - Command::new(self.llvm_out(self.config.build).join("build/bin/llvm-size")) - .arg("--version"), - ); + // XXX should we use LLVM version here? + // let stdout = build_helper::output( + // Command::new(self.llvm_out(self.config.build).join("build/bin/llvm-size")) + // .arg("--version"), + // ); - for line in stdout.lines() { - if line.contains("LLVM version") { - if let Some(vers) = line.split_whitespace().nth(2) { - return vers.to_string(); - } - } - } + // for line in stdout.lines() { + // if line.contains("LLVM version") { + // if let Some(vers) = line.split_whitespace().nth(2) { + // return vers.to_string(); + // } + // } + // } - panic!("The output of $LLVM_TOOL has changed; \ - please fix `bootstrap::Build.llvm_tools_vers`"); + // panic!("The output of $LLVM_TOOL has changed; \ + // please fix `bootstrap::Build.llvm_tools_vers`"); + + self.rust_version() } /// Returns the `version` string associated with this compiler for Rust