From 9a154a94b30baa333fe7399ee6dc2a01f395a27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Fri, 24 Jan 2020 00:00:00 +0000 Subject: [PATCH] compiletest: Remove unused llvm-cxxflags option --- src/bootstrap/test.rs | 7 +------ src/tools/compiletest/src/common.rs | 1 - src/tools/compiletest/src/header/tests.rs | 1 - src/tools/compiletest/src/main.rs | 2 -- src/tools/compiletest/src/runtest.rs | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index a186c16f1aa..6adf9ddaf34 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1149,7 +1149,6 @@ impl Step for Compiletest { // requires that a C++ compiler was configured which isn't always the case. if !builder.config.dry_run && suite == "run-make-fulldeps" { let llvm_components = output(Command::new(&llvm_config).arg("--components")); - let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags")); cmd.arg("--cc") .arg(builder.cc(target)) .arg("--cxx") @@ -1157,9 +1156,7 @@ impl Step for Compiletest { .arg("--cflags") .arg(builder.cflags(target, GitRepo::Rustc).join(" ")) .arg("--llvm-components") - .arg(llvm_components.trim()) - .arg("--llvm-cxxflags") - .arg(llvm_cxxflags.trim()); + .arg(llvm_components.trim()); if let Some(ar) = builder.ar(target) { cmd.arg("--ar").arg(ar); } @@ -1197,8 +1194,6 @@ impl Step for Compiletest { .arg("--cflags") .arg("") .arg("--llvm-components") - .arg("") - .arg("--llvm-cxxflags") .arg(""); } diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs index 9cc19060cbd..64c0298c1fa 100644 --- a/src/tools/compiletest/src/common.rs +++ b/src/tools/compiletest/src/common.rs @@ -319,7 +319,6 @@ pub struct Config { pub ar: String, pub linker: Option, pub llvm_components: String, - pub llvm_cxxflags: String, /// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests pub nodejs: Option, diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index b2d4ad382dd..38fa778219d 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -45,7 +45,6 @@ fn config() -> Config { "--cxx=c++", "--cflags=", "--llvm-components=", - "--llvm-cxxflags=", "--android-cross-path=", "--target=x86_64-unknown-linux-gnu", ]; diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 716bfd833d4..a61b9403987 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -116,7 +116,6 @@ pub fn parse_config(args: Vec) -> Config { .optopt("", "ar", "path to an archiver", "PATH") .optopt("", "linker", "path to a linker", "PATH") .reqopt("", "llvm-components", "list of LLVM components built in", "LIST") - .reqopt("", "llvm-cxxflags", "C++ flags for LLVM", "FLAGS") .optopt("", "llvm-bin-dir", "Path to LLVM's `bin` directory", "PATH") .optopt("", "nodejs", "the name of nodejs", "PATH") .optopt("", "remote-test-client", "path to the remote test client", "PATH") @@ -240,7 +239,6 @@ pub fn parse_config(args: Vec) -> Config { ar: matches.opt_str("ar").unwrap_or("ar".into()), linker: matches.opt_str("linker"), llvm_components: matches.opt_str("llvm-components").unwrap(), - llvm_cxxflags: matches.opt_str("llvm-cxxflags").unwrap(), nodejs: matches.opt_str("nodejs"), } } diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index d1ee60d74e7..7661ac27f02 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2651,7 +2651,6 @@ impl<'test> TestCx<'test> { .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path)) .env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path)) .env("LLVM_COMPONENTS", &self.config.llvm_components) - .env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags) // We for sure don't want these tests to run in parallel, so make // sure they don't have access to these vars if we run via `make` // at the top level