aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/cp')
-rw-r--r--gcc/cp/ChangeLog2
-rw-r--r--gcc/cp/Make-lang.in10
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 74f460e..9ed9a6f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -3,6 +3,8 @@
* parser.c (cp_parser_primary_expression): Add arguments to all the plugins.
* lex.c: Plugify.
* Make-lang.in (objcp/plugin/lex.h): Likewise.
+ (build/slashify): Harden against rebuilds.
+
* Make-lang.in (cp/parser.o): Move c-family/c-objc.h dependancy
down.
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 993c510..831c36a 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -333,15 +333,17 @@ cp/parser.o: $(objdir)/objcp/plugin/parser.h $(srcdir)/objcp/plugin/parser.c \
cp/lex.o: $(objdir)/objcp/plugin/lex.h c-family/c-objc.h
-build/slashify:: $(srcdir)/config/slashify.c
- $(COMPILER_FOR_BUILD) $(srcdir)/config/slashify.c -o $@
+# Would like to get rid of the #, but we always rebuild the checksum
+# if we do
+build/slashify: # $(srcdir)/config/slashify.c
+ $(COMPILER_FOR_BUILD) $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) $(srcdir)/config/slashify.c -o $@
-$(objdir)/objcp/plugin/parser.h: $(srcdir)/objcp/plugin/parser.h | build/slashify
+$(objdir)/objcp/plugin/parser.h: $(srcdir)/objcp/plugin/parser.h build/slashify
test -d objcp || mkdir objcp
test -d objcp/plugin || mkdir objcp/plugin
build/slashify < $< > $@
-$(objdir)/objcp/plugin/lex.h: $(srcdir)/objcp/plugin/lex.h | build/slashify
+$(objdir)/objcp/plugin/lex.h: $(srcdir)/objcp/plugin/lex.h build/slashify
test -d objcp || mkdir objcp
test -d objcp/plugin || mkdir objcp/plugin
build/slashify < $< > $@