aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-05-13 21:11:50 +0000
committerDJ Delorie <dj@redhat.com>2002-05-13 21:11:50 +0000
commit91e060aa2b7bed1c296847c8049d883d23591f23 (patch)
treea1c8278c8a34e6ca193a9437332e5cb4d9d93a18
parentc92a0210cd3c4458c7aee2412d65948723e81abe (diff)
downloadgdb-91e060aa2b7bed1c296847c8049d883d23591f23.zip
gdb-91e060aa2b7bed1c296847c8049d883d23591f23.tar.gz
gdb-91e060aa2b7bed1c296847c8049d883d23591f23.tar.bz2
* configure.in : Remove --srcdir argument from targargs and buildargs
(it's always overridden in the Makefile anyway). Rearrange a bit.
-rw-r--r--ChangeLog7
-rw-r--r--configure.in15
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8983a0e..55d388a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
2002-05-13 Nathanael Nerode <neroden@twcny.rr.com>
- * configure: move some logic to configure.in
- * configure.in: move some logic from configure
+ * configure.in : Remove --srcdir argument from targargs and buildargs
+ (it's always overridden in the Makefile anyway). Rearrange a bit.
+
+ * configure: Move some logic to configure.in.
+ * configure.in: Move some logic from configure.
2002-05-07 Jeff Johnston <jjohnstn@redhat.com>
diff --git a/configure.in b/configure.in
index 5b13cd4..67b45c5 100644
--- a/configure.in
+++ b/configure.in
@@ -1401,12 +1401,12 @@ if test "${shared}" = "yes" ; then
esac
fi
-# Record target_configdirs and the configure arguments for target and
-# build configuration in Makefile.
-target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
-targargs=`echo "${arguments}" | \
+# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
+# These are the ones we might not want to pass down to subconfigures.
+baseargs=`echo "${arguments}" | \
sed -e 's/--no[^ ]*//' \
-e 's/--cache[a-z-]*=[^ ]*//' \
+ -e 's/--sr[a-z-]*=[^ ]*//' \
-e 's/--ho[a-z-]*=[^ ]*//' \
-e 's/--bu[a-z-]*=[^ ]*//' \
-e 's/--ta[a-z-]*=[^ ]*//'`
@@ -1414,7 +1414,12 @@ targargs=`echo "${arguments}" | \
# For the build-side libraries, we just need to pretend we're native,
# and not use the same cache file. Multilibs are neither needed nor
# desired.
-buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${targargs}"
+buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}"
+
+# Record target_configdirs and the configure arguments for target and
+# build configuration in Makefile.
+target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
+targargs=${baseargs}
# Passing a --with-cross-host argument lets the target libraries know
# whether they are being built with a cross-compiler or being built