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
This commit is contained in:
Mike Stump 2011-02-13 12:33:42 +00:00 committed by Mike Stump
parent 029c8f3e77
commit a93fa71e59
5 changed files with 19 additions and 10 deletions

View File

@ -1,3 +1,8 @@
2011-02-13 Mike Stump <mikestump@comcast.net>
* config/t-darwin (build/slashify1): Harden against rebuilds.
* config/slashify.c: Nix parms to quite the build.
2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.

View File

@ -25,9 +25,9 @@ along with GCC; see the file COPYING3. If not see
#include <stdio.h>
extern int main (int, char **);
extern int main (void);
int main (int argc, char **argv) {
int main (void) {
int c,c1;
int saw_start = 0;
while ((c=getchar ()) != EOF) {

View File

@ -17,18 +17,18 @@
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
build/slashify:: $(srcdir)/config/slashify.c
$(COMPILER_FOR_BUILD) $(srcdir)/config/slashify.c -o $@
build/slashify1: $(srcdir)/config/slashify.c
$(COMPILER_FOR_BUILD) $(BUILD_COMPILERFLAGS) $(BUILD_CPPFLAGS) $(srcdir)/config/slashify.c -o $@
$(srcdir)/config/darwin.h: config/darwin.h.rebuild
config/darwin.h.rebuild: build/slashify
config/darwin.h.rebuild: build/slashify1
@if [ ! -e $(srcdir)/config/darwin.h \
-o $(srcdir)/config/darwin.h -nt config/darwin.h ]; then \
{ test -d config || mkdir config; } && \
cp -p $(srcdir)/config/darwin-sections.def \
config/darwin-sections.def && \
build/slashify < $(srcdir)/config/darwin.h >config/darwin.h; \
build/slashify1 < $(srcdir)/config/darwin.h >config/darwin.h; \
fi
darwin.o: $(srcdir)/config/darwin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \

View File

@ -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.

View File

@ -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 < $< > $@