aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Stump <mikestump@comcast.net>2011-02-13 13:03:20 +0000
committerMike Stump <mrs@gcc.gnu.org>2011-02-13 13:03:20 +0000
commit877ba3d5b1e907f9c51e3590e71488baf60f9e46 (patch)
tree0598f1c8fa34810348a3bea62345806b447e5f3a
parenta93fa71e59b4ae310d9953c1f6c87870383339f6 (diff)
downloadgcc-877ba3d5b1e907f9c51e3590e71488baf60f9e46.zip
gcc-877ba3d5b1e907f9c51e3590e71488baf60f9e46.tar.gz
gcc-877ba3d5b1e907f9c51e3590e71488baf60f9e46.tar.bz2
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
-rw-r--r--gcc/ChangeLog1
-rw-r--r--gcc/config/t-darwin6
-rw-r--r--gcc/cp/ChangeLog1
-rw-r--r--gcc/cp/Make-lang.in6
4 files changed, 7 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df33d96..2d2c69f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,6 +1,7 @@
2011-02-13 Mike Stump <mikestump@comcast.net>
* 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 <Ralf.Wildenhues@gmx.de>
diff --git a/gcc/config/t-darwin b/gcc/config/t-darwin
index 1caee4b..b8b872e 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 9ed9a6f..34f23da 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 831c36a..6ec4dda 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 < $< > $@