aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarcus Shawcroft <marcus.shawcroft@arm.com>2012-11-21 13:15:12 +0000
committerMarcus Shawcroft <mshawcroft@gcc.gnu.org>2012-11-21 13:15:12 +0000
commitc3e3d235489be0ffa764ab81f4d018b96b2a0d16 (patch)
tree996bfa211fb0fdd991ce79439ecb453377da65aa /gcc
parentdeadf3adbd73f73533b2a05403391e6e46f6225a (diff)
downloadgcc-c3e3d235489be0ffa764ab81f4d018b96b2a0d16.zip
gcc-c3e3d235489be0ffa764ab81f4d018b96b2a0d16.tar.gz
gcc-c3e3d235489be0ffa764ab81f4d018b96b2a0d16.tar.bz2
Fix parallel build race.
gengtype-lex.c is built twice, once for BUILD and once for HOST, but the BUILD flavour is missing a dependency on $(BCONFIG_H). 2012-11-21 Marcus Shawcroft <marcus.shawcroft@arm.com> * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H). From-SVN: r193691
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e76e8a..2815d01 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-21 Marcus Shawcroft <marcus.shawcroft@arm.com>
+
+ * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H).
+
2012-11-21 Bin Cheng <bin.cheng@arm.com>
* config/arm/arm-cores.def (cortex-m1, cortex-m0)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 17d5bd3..88b29ea 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3886,7 +3886,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)