* configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
* Makefile.tpl: Pass TOPLEVEL_CONFIGURE_ARGUMENTS to gcc. * Makefile.in: Regenerate. * configure: Regenerate.
This commit is contained in:
Nathanael Nerode
parent
e3abf9861a
commit
6309c9315a
|
|
@ -1,3 +1,10 @@
|
|||
2003-01-09 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
* configure.in: Substitute TOPLEVEL_CONFIGURE_ARGUMENTS.
|
||||
* Makefile.tpl: Pass TOPLEVEL_CONFIGURE_ARGUMENTS to gcc.
|
||||
* Makefile.in: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2003-01-09 Christian Cornelssen <ccorn@cs.tu-berlin.de>
|
||||
|
||||
* Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR.
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@ enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
|
|||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gcc_version = @gcc_version@
|
||||
|
||||
# The gcc driver likes to know the arguments it was configured with.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
|
||||
|
||||
srcdir = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
|
|
@ -7369,6 +7372,7 @@ configure-gcc:
|
|||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||
CXX="$(CXX)"; export CXX; \
|
||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
|
||||
AR="$(AR)"; export AR; \
|
||||
AS="$(AS)"; export AS; \
|
||||
|
|
|
|||
|
|
@ -49,6 +49,9 @@ enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
|
|||
gcc_version_trigger = @gcc_version_trigger@
|
||||
gcc_version = @gcc_version@
|
||||
|
||||
# The gcc driver likes to know the arguments it was configured with.
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
|
||||
|
||||
srcdir = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
|
|
@ -1105,6 +1108,7 @@ configure-gcc:
|
|||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||
CXX="$(CXX)"; export CXX; \
|
||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||
if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
|
||||
AR="$(AR)"; export AR; \
|
||||
AS="$(AS)"; export AS; \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -83,7 +83,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
|
||||
AC_SUBST(TOPLEVEL_CONFIGURE_ARGUMENTS)
|
||||
|
||||
moveifchange=${srcdir}/move-if-change
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue