Patchwork [RFC] Parallel build broken on trunk.

login
register
mail settings
Submitter Marcus Shawcroft
Date Nov. 21, 2012, 1:15 p.m.
Message ID <50ACD3F6.3060108@arm.com>
Download mbox | patch
Permalink /patch/200683/
State New
Headers show

Comments

Marcus Shawcroft - Nov. 21, 2012, 1:15 p.m.
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  <marcus.shawcroft@arm.com>

        * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H).
Ryan Hill - July 19, 2013, 4:29 a.m.
On Wed, 21 Nov 2012 13:15:34 +0000
Marcus Shawcroft <marcus.shawcroft@arm.com> wrote:

> Thanks for looking at this Laurynas.
> 
> I've committed the attached to trunk.
> 
> 
> /Marcus
> 
> 2012-11-21  Marcus Shawcroft  <marcus.shawcroft@arm.com>
> 
>         * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H).

This also affects 4.7.  Can we get a backport please?

Patch

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)