about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMichael Woerister <michaelwoerister@posteo.net>2017-01-30 12:28:31 -0500
committerMichael Woerister <michaelwoerister@posteo.net>2017-01-30 15:38:11 -0500
commitd292e1229f1e7cc882e550d3ecc0e152720a0ab5 (patch)
tree8aca182cbfed300fb32fe28f606beffc03a75ec6 /src
parent5f118b954e2aeced356511167319a31fc0503f47 (diff)
downloadrust-d292e1229f1e7cc882e550d3ecc0e152720a0ab5.tar.gz
rust-d292e1229f1e7cc882e550d3ecc0e152720a0ab5.zip
compiletest: Clear RUSTFLAGS env-var for run-make tests.
Diffstat (limited to 'src')
-rw-r--r--src/tools/compiletest/src/runtest.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index 05d6e21e9aa..86fa5e70c9c 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -2175,6 +2175,10 @@ actual:\n\
            .env("LLVM_COMPONENTS", &self.config.llvm_components)
            .env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags);
 
+        // We don't want RUSTFLAGS set from the outside to interfere with
+        // compiler flags set in the test cases:
+        cmd.env_remove("RUSTFLAGS");
+
         if self.config.target.contains("msvc") {
             // We need to pass a path to `lib.exe`, so assume that `cc` is `cl.exe`
             // and that `lib.exe` lives next to it.