From b71fea710cd8be5e34ac0b91ceb4aed6ceaad836 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 21 May 2020 11:23:04 +0200
Subject: [PATCH] just respect existing RUSTFLAGS instead of providing another
 override

---
 ci.sh | 2 +-
 miri  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci.sh b/ci.sh
index 922469aeca54..8c3fcebe94db 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # Determine configuration
 export RUST_TEST_NOCAPTURE=1
 export RUST_BACKTRACE=1
-export RUSTC_EXTRA_FLAGS="-D warnings"
+export RUSTFLAGS="-D warnings"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--all-features"
 
diff --git a/miri b/miri
index 948a839ef727..4b6426adb1dc 100755
--- a/miri
+++ b/miri
@@ -45,14 +45,14 @@ if ! test -d "$LIBDIR"; then
     echo "Please report a bug at https://github.com/rust-lang/miri/issues."
     exit 2
 fi
-# We set the rpath so that Miri finds the private rustc libraries it needs.
-# We enable debug-assertions to get tracing.
-# We enable line-only debuginfo for backtraces.
-export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTC_EXTRA_FLAGS"
 if [ -z "$CARGO_INCREMENTAL" ]; then
     # Default CARGO_INCREMENTAL to 1.
     export CARGO_INCREMENTAL=1
 fi
+# We set the rpath so that Miri finds the private rustc libraries it needs.
+# We enable debug-assertions to get tracing.
+# We enable line-only debuginfo for backtraces.
+export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTFLAGS"
 
 ## Helper functions