OSDN Git Service

(root) / pf3gnuchains / sourceware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 978ec2c)
2004-03-23 Nathanael Nerode <neroden@gcc.gnu.org>
authorneroden <neroden>
Wed, 24 Mar 2004 04:31:22 +0000 (04:31 +0000)
committerneroden <neroden>
Wed, 24 Mar 2004 04:31:22 +0000 (04:31 +0000)
* 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.in: Regenerate.

ChangeLog patch | blob | history
Makefile.in patch | blob | history
Makefile.tpl patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 56ba3dc..63163f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.in: Regenerate.
+
 2004-03-22  Nathanael Nerode  <neroden@gcc.gnu.org>
 
        * Makefile.tpl: Rearrange by moving recursive_targets rules
diff --git a/Makefile.in b/Makefile.in
index 68f43e6..8881791 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -24061,13 +24061,11 @@ configure-stage2-gcc: all-stage1-gcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -24075,6 +24073,8 @@ configure-stage2-gcc: all-stage1-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        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; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -24101,8 +24101,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        CFLAGS="$(BOOT_CFLAGS)" \
        ADAC="\$$(CC)" \
        WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
-       STRICT_WARN="\$$(STRICT2_WARN)" \
-       OUTPUT_OPTION="-o \$$@"
+       STRICT_WARN="\$$(STRICT2_WARN)"
 
 all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
        echo all-stage2-gcc > stage_last ; \
@@ -24131,18 +24130,16 @@ configure-stage3-gcc: all-stage2-gcc
        fi ; \
        [ -d stage3-gcc ] || mkdir stage3-gcc; \
        mv stage3-gcc gcc ; \
-       mv stage1-gcc prev-gcc ; \
+       mv stage2-gcc prev-gcc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -24150,6 +24147,8 @@ configure-stage3-gcc: all-stage2-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        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; \
        cd gcc || exit 1; \
        case $(srcdir) in \
diff --git a/Makefile.tpl b/Makefile.tpl
index 91fdae2..e486dfe 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1389,13 +1389,11 @@ configure-stage2-gcc: all-stage1-gcc
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -1403,6 +1401,8 @@ configure-stage2-gcc: all-stage1-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        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; \
        cd gcc || exit 1; \
        case $(srcdir) in \
@@ -1429,8 +1429,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        CFLAGS="$(BOOT_CFLAGS)" \
        ADAC="\$$(CC)" \
        WARN_CFLAGS="\$$(GCC_WARN_CFLAGS)" \
-       STRICT_WARN="\$$(STRICT2_WARN)" \
-       OUTPUT_OPTION="-o \$$@"
+       STRICT_WARN="\$$(STRICT2_WARN)"
 
 all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
        echo all-stage2-gcc > stage_last ; \
@@ -1459,18 +1458,16 @@ configure-stage3-gcc: all-stage2-gcc
        fi ; \
        [ -d stage3-gcc ] || mkdir stage3-gcc; \
        mv stage3-gcc gcc ; \
-       mv stage1-gcc prev-gcc ; \
+       mv stage2-gcc prev-gcc ; \
        r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
-       CC="$(CC)"; export CC; \
        CFLAGS="$(CFLAGS)"; export CFLAGS; \
        CXX="$(CXX)"; export CXX; \
        CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
        AR="$(AR)"; export AR; \
        AS="$(AS)"; export AS; \
-       CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
        DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
        LD="$(LD)"; export LD; \
        NM="$(NM)"; export NM; \
@@ -1478,6 +1475,8 @@ configure-stage3-gcc: all-stage2-gcc
        WINDRES="$(WINDRES)"; export WINDRES; \
        OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
        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; \
        cd gcc || exit 1; \
        case $(srcdir) in \
Yet another clone of sourceware.org.
About OSDN
Find Software
Develop Software
Help