diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-01-10 16:41:48 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2003-01-10 16:41:48 +0000 |
| commit | 3dfabf6338376e5ddad6a1400620d670d9bab2de (patch) | |
| tree | c29e550adfc594cccf230393db1659dda1b84fea /configure | |
| parent | 35082351bcf2c835ff7d4f3da5f4c2b6a7d7cc07 (diff) | |
| download | gcc-3dfabf6338376e5ddad6a1400620d670d9bab2de.zip gcc-3dfabf6338376e5ddad6a1400620d670d9bab2de.tar.gz gcc-3dfabf6338376e5ddad6a1400620d670d9bab2de.tar.bz2 | |
configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
* configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
* Makefile.tpl: Pass TOPLEVEL_CONFIGURE_ARGUMENTS to gcc.
* Makefile.in: Regenerate.
* configure: Regenerate.
From-SVN: r61161
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 40 |
1 files changed, 11 insertions, 29 deletions
@@ -740,7 +740,7 @@ if test -n "$PWD" ; then PWD=`${PWDCMD-pwd}`; fi # Export original configure arguments for use by sub-configures. TOPLEVEL_CONFIGURE_ARGUMENTS="$progname $@" -export TOPLEVEL_CONFIGURE_ARGUMENTS + moveifchange=${srcdir}/move-if-change @@ -3987,34 +3987,15 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs # Without the "./", some shells look in PATH for config.status. @@ -4099,6 +4080,7 @@ s%@build_alias@%$build_alias%g s%@build_cpu@%$build_cpu%g s%@build_vendor@%$build_vendor%g s%@build_os@%$build_os%g +s%@TOPLEVEL_CONFIGURE_ARGUMENTS@%$TOPLEVEL_CONFIGURE_ARGUMENTS%g /@maybe_dependencies@/r $maybe_dependencies s%@maybe_dependencies@%%g /@serialization_dependencies@/r $serialization_dependencies |