about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorTomasz Miąsko <tomasz.miasko@gmail.com>2020-01-24 00:00:00 +0000
committerTomasz Miąsko <tomasz.miasko@gmail.com>2020-01-27 12:08:53 +0100
commit9a154a94b30baa333fe7399ee6dc2a01f395a27d (patch)
tree21efc3066bb98427fcede14a111594370e73a146 /src/bootstrap
parentd857f6f1aba6308cb4458ec1d210f722d55017cb (diff)
compiletest: Remove unused llvm-cxxflags option
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/test.rs7
1 files changed, 1 insertions, 6 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("");
         }