From a93fa71e59b4ae310d9953c1f6c87870383339f6 Mon Sep 17 00:00:00 2001
From: Mike Stump <mikestump@comcast.net>
Date: Sun, 13 Feb 2011 12:33:42 +0000
Subject: t-darwin (build/slashify1): Harden against rebuilds.

	* config/t-darwin (build/slashify1): Harden against rebuilds.
	* config/slashify.c: Nix parms to quite the build.

cp:
	(build/slashify): Harden against rebuilds.

From-SVN: r170107
---
 gcc/cp/ChangeLog    |  2 ++
 gcc/cp/Make-lang.in | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'gcc/cp')

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 < $< > $@
-- 
cgit v1.1