This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] Fix some bootstrap inconveniences
- From: Paolo Bonzini <bonzini at gnu dot org>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 28 Apr 2006 23:37:34 +0200
- Subject: [PATCH] Fix some bootstrap inconveniences
This patch fixes:
a) the warning from make regarding `make restrap' being redefined
b) the problem with BOOT_ADAFLAGS not working
c) the problem with bfd and opcodes having been libtoolized for a while,
with nobody updating lib_path in Makefile.def.
I am going away for two weeks, when I come back I will apply a) as
obvious and b) as tested by Arno. Of course I hope to find approval for
c) in the meanwhile. :-)
Paolo
2006-04-28 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (bfd, opcodes): Fix lib_path.
* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Replace ADAC with ADAFLAGS.
(restrap): Move under "@if gcc-bootstrap". Fix typo.
Index: Makefile.def
===================================================================
--- Makefile.def (revision 113241)
+++ Makefile.def (working copy)
@@ -37,8 +37,8 @@ host_modules= { module= ash; };
host_modules= { module= autoconf; };
host_modules= { module= automake; };
host_modules= { module= bash; };
-host_modules= { module= bfd; lib_path=.; bootstrap=true; };
-host_modules= { module= opcodes; lib_path=.; bootstrap=true; };
+host_modules= { module= bfd; lib_path=.libs; bootstrap=true; };
+host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; };
host_modules= { module= binutils; bootstrap=true; };
host_modules= { module= bison; no_check_cross= true; };
host_modules= { module= byacc; no_check_cross= true; };
Index: Makefile.tpl
===================================================================
--- Makefile.tpl (revision 113241)
+++ Makefile.tpl (working copy)
@@ -1254,7 +1254,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
CFLAGS="$(BOOT_CFLAGS)" \
LIBCFLAGS="$(BOOT_CFLAGS)" \
LDFLAGS="$(BOOT_LDFLAGS)" \
- ADAC="\$$(CC)"
+ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
# For stage 1:
# * We force-disable intermodule optimizations, even if
@@ -1423,14 +1423,14 @@ do-distclean: distclean-stage1
# not work as a dependency, just as the minimum necessary to avoid errors.
stage_last:
$(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
-@endif gcc-bootstrap
.PHONY: restrap
restrap:
@: $(MAKE); $(stage)
rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
- +]stage[+id+] [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
+ +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+@endif gcc-bootstrap
# --------------------------------------
# Dependencies between different modules