Skip to content

Commit 9a154a9

Browse files
committed
compiletest: Remove unused llvm-cxxflags option
1 parent d857f6f commit 9a154a9

File tree

5 files changed

+1
-11
lines changed

5 files changed

+1
-11
lines changed

src/bootstrap/test.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,17 +1149,14 @@ impl Step for Compiletest {
11491149
// requires that a C++ compiler was configured which isn't always the case.
11501150
if !builder.config.dry_run && suite == "run-make-fulldeps" {
11511151
let llvm_components = output(Command::new(&llvm_config).arg("--components"));
1152-
let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags"));
11531152
cmd.arg("--cc")
11541153
.arg(builder.cc(target))
11551154
.arg("--cxx")
11561155
.arg(builder.cxx(target).unwrap())
11571156
.arg("--cflags")
11581157
.arg(builder.cflags(target, GitRepo::Rustc).join(" "))
11591158
.arg("--llvm-components")
1160-
.arg(llvm_components.trim())
1161-
.arg("--llvm-cxxflags")
1162-
.arg(llvm_cxxflags.trim());
1159+
.arg(llvm_components.trim());
11631160
if let Some(ar) = builder.ar(target) {
11641161
cmd.arg("--ar").arg(ar);
11651162
}
@@ -1197,8 +1194,6 @@ impl Step for Compiletest {
11971194
.arg("--cflags")
11981195
.arg("")
11991196
.arg("--llvm-components")
1200-
.arg("")
1201-
.arg("--llvm-cxxflags")
12021197
.arg("");
12031198
}
12041199

src/tools/compiletest/src/common.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ pub struct Config {
319319
pub ar: String,
320320
pub linker: Option<String>,
321321
pub llvm_components: String,
322-
pub llvm_cxxflags: String,
323322

324323
/// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests
325324
pub nodejs: Option<String>,

src/tools/compiletest/src/header/tests.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ fn config() -> Config {
4545
"--cxx=c++",
4646
"--cflags=",
4747
"--llvm-components=",
48-
"--llvm-cxxflags=",
4948
"--android-cross-path=",
5049
"--target=x86_64-unknown-linux-gnu",
5150
];

src/tools/compiletest/src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
116116
.optopt("", "ar", "path to an archiver", "PATH")
117117
.optopt("", "linker", "path to a linker", "PATH")
118118
.reqopt("", "llvm-components", "list of LLVM components built in", "LIST")
119-
.reqopt("", "llvm-cxxflags", "C++ flags for LLVM", "FLAGS")
120119
.optopt("", "llvm-bin-dir", "Path to LLVM's `bin` directory", "PATH")
121120
.optopt("", "nodejs", "the name of nodejs", "PATH")
122121
.optopt("", "remote-test-client", "path to the remote test client", "PATH")
@@ -240,7 +239,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
240239
ar: matches.opt_str("ar").unwrap_or("ar".into()),
241240
linker: matches.opt_str("linker"),
242241
llvm_components: matches.opt_str("llvm-components").unwrap(),
243-
llvm_cxxflags: matches.opt_str("llvm-cxxflags").unwrap(),
244242
nodejs: matches.opt_str("nodejs"),
245243
}
246244
}

src/tools/compiletest/src/runtest.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2651,7 +2651,6 @@ impl<'test> TestCx<'test> {
26512651
.env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
26522652
.env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path))
26532653
.env("LLVM_COMPONENTS", &self.config.llvm_components)
2654-
.env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags)
26552654
// We for sure don't want these tests to run in parallel, so make
26562655
// sure they don't have access to these vars if we run via `make`
26572656
// at the top level

0 commit comments

Comments
 (0)