From 877ba3d5b1e907f9c51e3590e71488baf60f9e46 Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Sun, 13 Feb 2011 13:03:20 +0000 Subject: [PATCH] t-darwin (config/darwin.h.rebuild): Harden against parallel builds. * config/t-darwin (config/darwin.h.rebuild): Harden against parallel builds. cp: * Make-lang.in (objcp/plugin/parser.h): Harden against parallel builds. From-SVN: r170108 --- gcc/ChangeLog | 1 + gcc/config/t-darwin | 6 +++--- gcc/cp/ChangeLog | 1 + gcc/cp/Make-lang.in | 6 ++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index df33d96a5f4..2d2c69fe33f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,7 @@ 2011-02-13 Mike Stump * config/t-darwin (build/slashify1): Harden against rebuilds. + (config/darwin.h.rebuild): Harden against parallel builds. * config/slashify.c: Nix parms to quite the build. 2011-02-13 Ralf Wildenhues diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin index 1caee4bed18..b8b872e73ea 100644 --- a/gcc/config/t-darwin +++ b/gcc/config/t-darwin @@ -23,11 +23,11 @@ build/slashify1: $(srcdir)/config/slashify.c $(srcdir)/config/darwin.h: config/darwin.h.rebuild config/darwin.h.rebuild: build/slashify1 + @$(mkinstalldirs) config @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 && \ + cp $(srcdir)/config/darwin-sections.def \ + config/darwin-sections.def && \ build/slashify1 < $(srcdir)/config/darwin.h >config/darwin.h; \ fi diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9ed9a6fb360..34f23dafd95 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -4,6 +4,7 @@ * lex.c: Plugify. * Make-lang.in (objcp/plugin/lex.h): Likewise. (build/slashify): Harden against rebuilds. + (objcp/plugin/parser.h): Harden against parallel builds. * 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 831c36ac787..6ec4dda7d55 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -339,11 +339,9 @@ 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 - test -d objcp || mkdir objcp - test -d objcp/plugin || mkdir objcp/plugin + $(mkinstalldirs) objcp/plugin 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 + $(mkinstalldirs) objcp/plugin build/slashify < $< > $@ -- 2.30.2