From 324e63de289e249481445a399fcbcad62b7ab71d Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sun, 1 Nov 2020 19:38:21 +0100
Subject: [PATCH] Ensure that sysroot build works with CARGO_TARGET_DIR set

---
 build_sysroot/build_sysroot.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh
index 04c82ca2a512..2b2208fc8e59 100755
--- a/build_sysroot/build_sysroot.sh
+++ b/build_sysroot/build_sysroot.sh
@@ -9,6 +9,9 @@ pushd ../ >/dev/null
 source ./scripts/config.sh
 popd >/dev/null
 
+# We expect the target dir in the default location. Guard against the user changing it.
+export CARGO_TARGET_DIR=target
+
 # Cleanup for previous run
 #     v Clean target dir except for build scripts and incremental cache
 rm -r target/*/{debug,release}/{build,deps,examples,libsysroot*,native} 2>/dev/null || true