about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/librustc_trans_utils/trans_crate.rs2
-rw-r--r--src/tools/compiletest/src/runtest.rs2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_trans_utils/trans_crate.rs b/src/librustc_trans_utils/trans_crate.rs
index 33adf24374a..0d81d6fde6a 100644
--- a/src/librustc_trans_utils/trans_crate.rs
+++ b/src/librustc_trans_utils/trans_crate.rs
@@ -279,8 +279,6 @@ impl TransCrate for MetadataOnlyTransCrate {
         sess.abort_if_errors();
         if !sess.opts.crate_types.contains(&CrateType::CrateTypeRlib)
             && !sess.opts.crate_types.contains(&CrateType::CrateTypeDylib)
-            // Don't error when running under compiletest
-            && ::std::env::var("RUSTC_COMPILETEST") != Ok("1".to_string())
         {
             sess.fatal("Executables are not supported by the metadata-only backend.");
         }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index f849b0a4410..efbe5e32fcd 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1278,7 +1278,7 @@ impl<'test> TestCx<'test> {
             TargetLocation::ThisFile(self.make_exe_name()),
         );
 
-        rustc.arg("-L").arg(&self.aux_output_dir_name()).env("RUSTC_COMPILETEST", "1");
+        rustc.arg("-L").arg(&self.aux_output_dir_name());
 
         match self.config.mode {
             CompileFail | Ui => {