Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure for stages 2 and 3 as well as in make.
* Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure for stages 2 and 3 as well as in make. As a consequence, remove OUTPUT_OPTION (now detected by configure) from the flags passed down to make. * Makefile.in: Regenerate. From-SVN: r79892
This commit is contained in:
parent
5a93e8dea1
commit
cbfd7e06e5
|
@ -1,5 +1,11 @@
|
||||||
2004-03-23 Nathanael Nerode <neroden@gcc.gnu.org>
|
2004-03-23 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||||
|
|
||||||
|
* Makefile.tpl (new-bootstrap): Set CC and CC_FOR_BUILD in configure
|
||||||
|
for stages 2 and 3 as well as in make. As a consequence, remove
|
||||||
|
OUTPUT_OPTION (now detected by configure) from the flags passed down
|
||||||
|
to make.
|
||||||
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
* Makefile.tpl (new-bootstrap): Fix typo.
|
* Makefile.tpl (new-bootstrap): Fix typo.
|
||||||
* Makefile.in: Regenerate.
|
* Makefile.in: Regenerate.
|
||||||
|
|
||||||
|
|
11
Makefile.in
11
Makefile.in
|
@ -24061,13 +24061,11 @@ configure-stage2-gcc: all-stage1-gcc
|
||||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||||
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||||
CC="$(CC)"; export CC; \
|
|
||||||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||||
CXX="$(CXX)"; export CXX; \
|
CXX="$(CXX)"; export CXX; \
|
||||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||||
AR="$(AR)"; export AR; \
|
AR="$(AR)"; export AR; \
|
||||||
AS="$(AS)"; export AS; \
|
AS="$(AS)"; export AS; \
|
||||||
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
|
||||||
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
||||||
LD="$(LD)"; export LD; \
|
LD="$(LD)"; export LD; \
|
||||||
NM="$(NM)"; export NM; \
|
NM="$(NM)"; export NM; \
|
||||||
|
@ -24075,6 +24073,8 @@ configure-stage2-gcc: all-stage1-gcc
|
||||||
WINDRES="$(WINDRES)"; export WINDRES; \
|
WINDRES="$(WINDRES)"; export WINDRES; \
|
||||||
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
||||||
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
||||||
|
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||||
|
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
|
||||||
echo Configuring stage 2 in gcc; \
|
echo Configuring stage 2 in gcc; \
|
||||||
cd gcc || exit 1; \
|
cd gcc || exit 1; \
|
||||||
case $(srcdir) in \
|
case $(srcdir) in \
|
||||||
|
@ -24101,8 +24101,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
||||||
CFLAGS="$(BOOT_CFLAGS)" \
|
CFLAGS="$(BOOT_CFLAGS)" \
|
||||||
ADAC="\$$(CC)" \
|
ADAC="\$$(CC)" \
|
||||||
WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
|
WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
|
||||||
STRICT_WARN="\$$(STRICT2_WARN)" \
|
STRICT_WARN="\$$(STRICT2_WARN)"
|
||||||
OUTPUT_OPTION="-o \$$@"
|
|
||||||
|
|
||||||
all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
|
all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
|
||||||
echo all-stage2-gcc > stage_last ; \
|
echo all-stage2-gcc > stage_last ; \
|
||||||
|
@ -24136,13 +24135,11 @@ configure-stage3-gcc: all-stage2-gcc
|
||||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||||
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||||
CC="$(CC)"; export CC; \
|
|
||||||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||||
CXX="$(CXX)"; export CXX; \
|
CXX="$(CXX)"; export CXX; \
|
||||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||||
AR="$(AR)"; export AR; \
|
AR="$(AR)"; export AR; \
|
||||||
AS="$(AS)"; export AS; \
|
AS="$(AS)"; export AS; \
|
||||||
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
|
||||||
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
||||||
LD="$(LD)"; export LD; \
|
LD="$(LD)"; export LD; \
|
||||||
NM="$(NM)"; export NM; \
|
NM="$(NM)"; export NM; \
|
||||||
|
@ -24150,6 +24147,8 @@ configure-stage3-gcc: all-stage2-gcc
|
||||||
WINDRES="$(WINDRES)"; export WINDRES; \
|
WINDRES="$(WINDRES)"; export WINDRES; \
|
||||||
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
||||||
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
||||||
|
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||||
|
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
|
||||||
echo Configuring stage 3 in gcc; \
|
echo Configuring stage 3 in gcc; \
|
||||||
cd gcc || exit 1; \
|
cd gcc || exit 1; \
|
||||||
case $(srcdir) in \
|
case $(srcdir) in \
|
||||||
|
|
11
Makefile.tpl
11
Makefile.tpl
|
@ -1389,13 +1389,11 @@ configure-stage2-gcc: all-stage1-gcc
|
||||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||||
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||||
CC="$(CC)"; export CC; \
|
|
||||||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||||
CXX="$(CXX)"; export CXX; \
|
CXX="$(CXX)"; export CXX; \
|
||||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||||
AR="$(AR)"; export AR; \
|
AR="$(AR)"; export AR; \
|
||||||
AS="$(AS)"; export AS; \
|
AS="$(AS)"; export AS; \
|
||||||
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
|
||||||
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
||||||
LD="$(LD)"; export LD; \
|
LD="$(LD)"; export LD; \
|
||||||
NM="$(NM)"; export NM; \
|
NM="$(NM)"; export NM; \
|
||||||
|
@ -1403,6 +1401,8 @@ configure-stage2-gcc: all-stage1-gcc
|
||||||
WINDRES="$(WINDRES)"; export WINDRES; \
|
WINDRES="$(WINDRES)"; export WINDRES; \
|
||||||
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
||||||
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
||||||
|
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||||
|
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
|
||||||
echo Configuring stage 2 in gcc; \
|
echo Configuring stage 2 in gcc; \
|
||||||
cd gcc || exit 1; \
|
cd gcc || exit 1; \
|
||||||
case $(srcdir) in \
|
case $(srcdir) in \
|
||||||
|
@ -1429,8 +1429,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
|
||||||
CFLAGS="$(BOOT_CFLAGS)" \
|
CFLAGS="$(BOOT_CFLAGS)" \
|
||||||
ADAC="\$$(CC)" \
|
ADAC="\$$(CC)" \
|
||||||
WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
|
WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
|
||||||
STRICT_WARN="\$$(STRICT2_WARN)" \
|
STRICT_WARN="\$$(STRICT2_WARN)"
|
||||||
OUTPUT_OPTION="-o \$$@"
|
|
||||||
|
|
||||||
all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
|
all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
|
||||||
echo all-stage2-gcc > stage_last ; \
|
echo all-stage2-gcc > stage_last ; \
|
||||||
|
@ -1464,13 +1463,11 @@ configure-stage3-gcc: all-stage2-gcc
|
||||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||||
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||||||
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
||||||
CC="$(CC)"; export CC; \
|
|
||||||
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
||||||
CXX="$(CXX)"; export CXX; \
|
CXX="$(CXX)"; export CXX; \
|
||||||
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
||||||
AR="$(AR)"; export AR; \
|
AR="$(AR)"; export AR; \
|
||||||
AS="$(AS)"; export AS; \
|
AS="$(AS)"; export AS; \
|
||||||
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
|
||||||
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
||||||
LD="$(LD)"; export LD; \
|
LD="$(LD)"; export LD; \
|
||||||
NM="$(NM)"; export NM; \
|
NM="$(NM)"; export NM; \
|
||||||
|
@ -1478,6 +1475,8 @@ configure-stage3-gcc: all-stage2-gcc
|
||||||
WINDRES="$(WINDRES)"; export WINDRES; \
|
WINDRES="$(WINDRES)"; export WINDRES; \
|
||||||
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
||||||
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
||||||
|
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \
|
||||||
|
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
|
||||||
echo Configuring stage 3 in gcc; \
|
echo Configuring stage 3 in gcc; \
|
||||||
cd gcc || exit 1; \
|
cd gcc || exit 1; \
|
||||||
case $(srcdir) in \
|
case $(srcdir) in \
|
||||||
|
|
Loading…
Reference in New Issue