diff options
| author | Nathanael Nerode <neroden@twcny.rr.com> | 2002-05-13 21:11:55 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@gcc.gnu.org> | 2002-05-13 17:11:55 -0400 |
| commit | e254d6b515a0b500f555bbd01a9d88a9455c657a (patch) | |
| tree | 6cbf727833dc90377221c425cfefcf690384c177 | |
| parent | 6cdef75d090fb5e4d4b1225a5f325822c992f35c (diff) | |
| download | gcc-e254d6b515a0b500f555bbd01a9d88a9455c657a.tar.gz | |
configure.in: Remove --srcdir argument from targargs and buildargs (it's always overridden in...
* configure.in : Remove --srcdir argument from targargs and buildargs
(it's always overridden in the Makefile anyway). Rearrange a bit.
From-SVN: r53433
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 15 |
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 7ea9f1e8e74..4b16869edd8 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-11 Tom Tromey <tromey@redhat.com> diff --git a/configure.in b/configure.in index 5b13cd4a984..67b45c5aad9 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 |