about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-06-23 23:35:47 +0000
committerbors <bors@rust-lang.org>2015-06-23 23:35:47 +0000
commit4b4a672a8ff711f9f04aca55a1149fe8f9a31b82 (patch)
treea91812bbcf9c1129bcbbc3d0d7095e9c478df617
parent55deea606bd44022a5fe588ed506775dca3aecf7 (diff)
parent59399088ca168621a6fcd012875fbe83db09d706 (diff)
downloadrust-4b4a672a8ff711f9f04aca55a1149fe8f9a31b82.tar.gz
rust-4b4a672a8ff711f9f04aca55a1149fe8f9a31b82.zip
Auto merge of #26491 - omasanori:fix-18670, r=brson
I've configured with the parameters suggested by @brson in #18670 and confirmed that it works on Gentoo Linux amd64.

Fixes #18670.
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index b0549205ace..1db7f483a9f 100755
--- a/configure
+++ b/configure
@@ -1037,6 +1037,14 @@ for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
   CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
 done
 
+# copy build-triples to host-triples so that builds are a subset of hosts
+V_TEMP=""
+for i in $CFG_BUILD $CFG_HOST;
+do
+   echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
+done
+CFG_HOST=$V_TEMP
+
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""
 for i in $CFG_HOST $CFG_TARGET;