From f01be9199719ece8f643347627d8b549b375009d Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Thu, 16 Jun 2016 11:00:46 +0200
Subject: [PATCH] miri needs to be *built* with RUST_SYSROOT, not *run*

---
 .travis.yml          | 2 +-
 tests/compiletest.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cd9f665d1b3..e76a2f86cf9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ before_script:
   export PATH=$HOME/.local/bin:$PATH
 script:
 - |
-  travis-cargo build &&
+  env RUST_SYSROOT=$HOME/rust travis-cargo build &&
   env RUST_SYSROOT=$HOME/rust travis-cargo test
 notifications:
   email:
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 7a7de52992f..d5ea91f0151 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -63,7 +63,6 @@ fn compile_test() {
             cmd.arg(format!("--sysroot={}", sysroot));
             cmd.arg("-Dwarnings");
             cmd.arg(format!("--target={}", target));
-            cmd.env("RUST_SYSROOT", &sysroot);
             let libs = Path::new(&sysroot).join("lib");
             let sysroot = libs.join("rustlib").join(&target).join("lib");
             let paths = std::env::join_paths(&[libs, sysroot]).unwrap();