From patchwork Wed Nov 21 13:15:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC] Parallel build broken on trunk. Date: Wed, 21 Nov 2012 03:15:34 -0000 From: Marcus Shawcroft X-Patchwork-Id: 200683 Message-Id: <50ACD3F6.3060108@arm.com> To: "gcc-patches@gcc.gnu.org" Cc: Laurynas Biveinis On 21/11/12 09:48, Laurynas Biveinis wrote: > Probably not, but I see your patch not as papering over but rather a > missing piece of what's been committed in 2010. Fixing parallel builds > does not preclude a better fix for build/host separation later. > >> diff --git a/gcc/Makefile.in b/gcc/Makefile.in >> index d74e7b3..8e8f4d3 100644 >> --- a/gcc/Makefile.in >> +++ b/gcc/Makefile.in >> @@ -3885,7 +3885,7 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) >> $(SYSTEM_H) rtl.def >> # the build-%: rule doesn't apply to them. >> >> gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) >> -gengtype-lex.o: $(CONFIG_H) >> +gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) >> CFLAGS-gengtype-lex.o += -DGENERATOR_FILE >> build/gengtype-lex.o: $(BCONFIG_H) > > This is OK with a proper ChangeLog entry. Hopefully I am not > overstepping my gengtype reviewer powers here. > Thanks for looking at this Laurynas. I've committed the attached to trunk. /Marcus 2012-11-21 Marcus Shawcroft * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H). diff --git a/gcc/Makefile.in b/gcc/Makefile.in index d74e7b3..8e8f4d3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3885,7 +3885,7 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def # the build-%: rule doesn't apply to them. gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) -gengtype-lex.o: $(CONFIG_H) +gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) CFLAGS-gengtype-lex.o += -DGENERATOR_FILE build/gengtype-lex.o: $(BCONFIG_H)