OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.tpl: Clean up experimental top level bootstrap support...

Browse Source 
2004-03-22  Nathanael Nerode  <neroden@gcc.gnu.org>

	* Makefile.tpl: Clean up experimental top level bootstrap support:
	note known problems; set CONFIG_SHELL; don't set BUILD_CC; relocate
	prev-gcc in configure- targets as well as all- targets.
	* Makefile.in: Regenerate.

From-SVN: r79812
This commit is contained in:
Nathanael Nerode 2004-03-22 06:19:44 +00:00
parent 400e39e37d
commit ca3b3e200a
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-03-22 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Clean up experimental top level bootstrap support:
note known problems; set CONFIG_SHELL; don't set BUILD_CC; relocate
prev-gcc in configure- targets as well as all- targets.
* Makefile.in: Regenerate.
2004-03-21 Kelley Cook <kcook@gcc.gnu.org> 2004-03-21 Kelley Cook <kcook@gcc.gnu.org>
* compile: New file imported from automake. * compile: New file imported from automake.

22
Makefile.in
View File

@ -23777,6 +23777,7 @@ STAMP = echo timestamp >
STAGE1_CFLAGS=@stage1_cflags@ STAGE1_CFLAGS=@stage1_cflags@
STAGE1_LANGUAGES=@stage1_languages@ STAGE1_LANGUAGES=@stage1_languages@
# TODO: deal with OBJS-onestep
configure-stage1-gcc: configure-stage1-gcc:
echo configure-stage1-gcc > stage_last ; \ echo configure-stage1-gcc > stage_last ; \
if [ -f stage1-gcc/Makefile ] ; then \ if [ -f stage1-gcc/Makefile ] ; then \
@ -23789,11 +23790,12 @@ configure-stage1-gcc:
mv stage1-gcc gcc ; \ mv stage1-gcc gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -23837,6 +23839,7 @@ all-stage1-gcc: configure-stage1-gcc all-bootstrap
mv gcc stage1-gcc ; \ mv gcc stage1-gcc ; \
$(STAMP) all-stage1-gcc $(STAMP) all-stage1-gcc
# TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally)
configure-stage2-gcc: all-stage1-gcc configure-stage2-gcc: all-stage1-gcc
echo configure-stage2-gcc > stage_last ; \ echo configure-stage2-gcc > stage_last ; \
if [ -f stage2-gcc/Makefile ] ; then \ if [ -f stage2-gcc/Makefile ] ; then \
@ -23847,13 +23850,15 @@ configure-stage2-gcc: all-stage1-gcc
fi ; \ fi ; \
[ -d stage2-gcc ] || mkdir stage2-gcc; \ [ -d stage2-gcc ] || mkdir stage2-gcc; \
mv stage2-gcc gcc ; \ mv stage2-gcc gcc ; \
mv stage1-gcc prev-gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -23881,6 +23886,7 @@ configure-stage2-gcc: all-stage1-gcc
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} ; \
cd .. ; \ cd .. ; \
mv gcc stage2-gcc ; \ mv gcc stage2-gcc ; \
mv prev-gcc stage1-gcc ; \
$(STAMP) configure-stage2-gcc $(STAMP) configure-stage2-gcc
# Flags to pass to stage2 and later makes. # Flags to pass to stage2 and later makes.
@ -23901,7 +23907,6 @@ all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
cd gcc && \ cd gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) \ $(MAKE) $(GCC_FLAGS_TO_PASS) \
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
BUILD_CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=$$r/prev-gcc/ \ STAGE_PREFIX=$$r/prev-gcc/ \
$(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \
@ -23920,13 +23925,15 @@ configure-stage3-gcc: all-stage2-gcc
fi ; \ fi ; \
[ -d stage3-gcc ] || mkdir stage3-gcc; \ [ -d stage3-gcc ] || mkdir stage3-gcc; \
mv stage3-gcc gcc ; \ mv stage3-gcc gcc ; \
mv stage1-gcc prev-gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -23954,13 +23961,9 @@ configure-stage3-gcc: all-stage2-gcc
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} ; \
cd .. ; \ cd .. ; \
mv gcc stage3-gcc ; \ mv gcc stage3-gcc ; \
mv prev-gcc stage2-gcc ; \
$(STAMP) configure-stage3-gcc $(STAMP) configure-stage3-gcc
# Some files might not exist. This is disabled 'cause it don't work.
# cp prev-gcc/objc/objc-parse.c gcc/objc/objc-parse.c || true ; \
# cp prev-gcc/java/parse.c gcc/java/parse.c || true ; \
# cp prev-gcc/java/parse-scan.c gcc/java/parse-scan.c || true ; \
all-stage3-gcc: all-stage2-gcc configure-stage3-gcc all-stage3-gcc: all-stage2-gcc configure-stage3-gcc
echo all-stage3-gcc > stage_last ; \ echo all-stage3-gcc > stage_last ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
@ -23970,7 +23973,6 @@ all-stage3-gcc: all-stage2-gcc configure-stage3-gcc
cd gcc && \ cd gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) \ $(MAKE) $(GCC_FLAGS_TO_PASS) \
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
BUILD_CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=$$r/prev-gcc/ \ STAGE_PREFIX=$$r/prev-gcc/ \
$(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \

22
Makefile.tpl
View File

@ -1294,6 +1294,7 @@ STAMP = echo timestamp >
STAGE1_CFLAGS=@stage1_cflags@ STAGE1_CFLAGS=@stage1_cflags@
STAGE1_LANGUAGES=@stage1_languages@ STAGE1_LANGUAGES=@stage1_languages@
# TODO: deal with OBJS-onestep
configure-stage1-gcc: configure-stage1-gcc:
echo configure-stage1-gcc > stage_last ; \ echo configure-stage1-gcc > stage_last ; \
if [ -f stage1-gcc/Makefile ] ; then \ if [ -f stage1-gcc/Makefile ] ; then \
@ -1306,11 +1307,12 @@ configure-stage1-gcc:
mv stage1-gcc gcc ; \ mv stage1-gcc gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -1354,6 +1356,7 @@ all-stage1-gcc: configure-stage1-gcc all-bootstrap
mv gcc stage1-gcc ; \ mv gcc stage1-gcc ; \
$(STAMP) all-stage1-gcc $(STAMP) all-stage1-gcc
# TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally)
configure-stage2-gcc: all-stage1-gcc configure-stage2-gcc: all-stage1-gcc
echo configure-stage2-gcc > stage_last ; \ echo configure-stage2-gcc > stage_last ; \
if [ -f stage2-gcc/Makefile ] ; then \ if [ -f stage2-gcc/Makefile ] ; then \
@ -1364,13 +1367,15 @@ configure-stage2-gcc: all-stage1-gcc
fi ; \ fi ; \
[ -d stage2-gcc ] || mkdir stage2-gcc; \ [ -d stage2-gcc ] || mkdir stage2-gcc; \
mv stage2-gcc gcc ; \ mv stage2-gcc gcc ; \
mv stage1-gcc prev-gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -1398,6 +1403,7 @@ configure-stage2-gcc: all-stage1-gcc
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} ; \
cd .. ; \ cd .. ; \
mv gcc stage2-gcc ; \ mv gcc stage2-gcc ; \
mv prev-gcc stage1-gcc ; \
$(STAMP) configure-stage2-gcc $(STAMP) configure-stage2-gcc
# Flags to pass to stage2 and later makes. # Flags to pass to stage2 and later makes.
@ -1418,7 +1424,6 @@ all-stage2-gcc: all-stage1-gcc configure-stage2-gcc
cd gcc && \ cd gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) \ $(MAKE) $(GCC_FLAGS_TO_PASS) \
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
BUILD_CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=$$r/prev-gcc/ \ STAGE_PREFIX=$$r/prev-gcc/ \
$(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \
@ -1437,13 +1442,15 @@ configure-stage3-gcc: all-stage2-gcc
fi ; \ fi ; \
[ -d stage3-gcc ] || mkdir stage3-gcc; \ [ -d stage3-gcc ] || mkdir stage3-gcc; \
mv stage3-gcc gcc ; \ mv stage3-gcc gcc ; \
mv stage1-gcc prev-gcc ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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; \ 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; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
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; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@ -1471,13 +1478,9 @@ configure-stage3-gcc: all-stage2-gcc
$(HOST_CONFIGARGS) $${srcdiroption} ; \ $(HOST_CONFIGARGS) $${srcdiroption} ; \
cd .. ; \ cd .. ; \
mv gcc stage3-gcc ; \ mv gcc stage3-gcc ; \
mv prev-gcc stage2-gcc ; \
$(STAMP) configure-stage3-gcc $(STAMP) configure-stage3-gcc
# Some files might not exist. This is disabled 'cause it don't work.
# cp prev-gcc/objc/objc-parse.c gcc/objc/objc-parse.c || true ; \
# cp prev-gcc/java/parse.c gcc/java/parse.c || true ; \
# cp prev-gcc/java/parse-scan.c gcc/java/parse-scan.c || true ; \
all-stage3-gcc: all-stage2-gcc configure-stage3-gcc all-stage3-gcc: all-stage2-gcc configure-stage3-gcc
echo all-stage3-gcc > stage_last ; \ echo all-stage3-gcc > stage_last ; \
r=`${PWD_COMMAND}`; export r; \ r=`${PWD_COMMAND}`; export r; \
@ -1487,7 +1490,6 @@ all-stage3-gcc: all-stage2-gcc configure-stage3-gcc
cd gcc && \ cd gcc && \
$(MAKE) $(GCC_FLAGS_TO_PASS) \ $(MAKE) $(GCC_FLAGS_TO_PASS) \
CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
BUILD_CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \
STAGE_PREFIX=$$r/prev-gcc/ \ STAGE_PREFIX=$$r/prev-gcc/ \
$(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \