aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a00f1ca..28b07cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 13 10:22:56 1997 Bob Manson <manson@charmed.cygnus.com>
+
+ * configure.in (targargs): Strip out any supplied --build argument
+ before adding our own. Always add --build.
+
Thu Jun 12 21:12:28 1997 Bob Manson <manson@charmed.cygnus.com>
* configure.in (targargs): Pass --build if we're doing
diff --git a/configure.in b/configure.in
index 112aa2e..95654f4 100644
--- a/configure.in
+++ b/configure.in
@@ -870,6 +870,7 @@ targargs=`echo "${arguments}" | \
sed -e 's/--norecursion//' \
-e 's/--cache[a-z-]*=[^ ]*//' \
-e 's/--ho[a-z-]*=[^ ]*//' \
+ -e 's/--bu[a-z-]*=[^ ]*//' \
-e 's/--ta[a-z-]*=[^ ]*//'`
# Passing a --with-cross-host argument lets the target libraries know
@@ -878,7 +879,7 @@ targargs=`echo "${arguments}" | \
# sorts of decisions they want to make on this basis. Please consider
# this option to be deprecated. FIXME.
if [ x${is_cross_compiler} = xyes ]; then
- targargs="--with-cross-host=${host_alias} --build=${build_alias} ${targargs}"
+ targargs="--with-cross-host=${host_alias} ${targargs}"
fi
# Default to --enable-multilib.
@@ -886,7 +887,7 @@ if [ x${enable_multilib} = x ]; then
targargs="--enable-multilib ${targargs}"
fi
-targargs="--host=${target_alias} ${targargs}"
+targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
sed -e "s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
-e "s%^CONFIG_ARGUMENTS[ ]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
-e "s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \