nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 15:23:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

compiletest: Remove unused llvm-cxxflags option

Browse Source
This commit is contained in:
Tomasz Miąsko 2020-01-24 00:00:00 +00:00
parent d857f6f1ab
commit 9a154a94b3
5 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/test.rs
View File

@ -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("");
}

1
src/tools/compiletest/src/common.rs
View File

@ -319,7 +319,6 @@ pub struct Config {
pub ar: String,
pub linker: Option<String>,
pub llvm_components: String,
pub llvm_cxxflags: String,
/// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests
pub nodejs: Option<String>,

1
src/tools/compiletest/src/header/tests.rs
View File

@ -45,7 +45,6 @@ fn config() -> Config {
"--cxx=c++",
"--cflags=",
"--llvm-components=",
"--llvm-cxxflags=",
"--android-cross-path=",
"--target=x86_64-unknown-linux-gnu",
];

2
src/tools/compiletest/src/main.rs
View File

@ -116,7 +116,6 @@ pub fn parse_config(args: Vec<String>) -> 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<String>) -> 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"),
}
}

1
src/tools/compiletest/src/runtest.rs
View File

@ -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