aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Brooksby2012-09-18 18:33:07 +0100
committerRichard Brooksby2012-09-18 18:33:07 +0100
commit847bd516aadfbf6ebe17bbf8be2bd2d1129f7db6 (patch)
treef96e1b82692363d3a38d55bf01560aecb3a4c49d
parent0353e7c200f33fbd5da1fe981840987639580dbd (diff)
downloademacs-847bd516aadfbf6ebe17bbf8be2bd2d1129f7db6.tar.gz
emacs-847bd516aadfbf6ebe17bbf8be2bd2d1129f7db6.zip
Reinstating "mkdir -p" so that "make -j" can do a parallel make. we only avoided "mkdir -p" because it was broken on osf/1.
Copied from Perforce Change: 179534 ServerID: perforce.ravenbrook.com
-rw-r--r--mps/code/comm.gmk22
1 files changed, 16 insertions, 6 deletions
diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 6ab9dec268c..2e16905eab7 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -430,15 +430,13 @@ endif
430# GENERIC RULES 430# GENERIC RULES
431# 431#
432# These generate build output in the <pfm>/<variety> directory. 432# These generate build output in the <pfm>/<variety> directory.
433# Note that we can't used "mkdir -p" to create this directory because
434# it's broken (w.r.t. the man page) under OSF/1.
435 433
436# Object files 434# Object files
437 435
438define run-cc 436define run-cc
439$(ECHO) "$(PFM): $@" 437$(ECHO) "$(PFM): $@"
440test -d $(PFM) || mkdir $(PFM) 438mkdir -p $(PFM)
441test -d $(PFM)/$(VARIETY) || mkdir $(PFM)/$(VARIETY) 439mkdir -p $(PFM)/$(VARIETY)
442$(CC) $(CFLAGS) -c -o $@ $< 440$(CC) $(CFLAGS) -c -o $@ $<
443endef 441endef
444 442
@@ -462,12 +460,21 @@ ifdef gendep
462 460
463$(PFM)/$(VARIETY)/%.d: %.c 461$(PFM)/$(VARIETY)/%.d: %.c
464 $(ECHO) "$(PFM): $@" 462 $(ECHO) "$(PFM): $@"
465 test -d $(PFM) || mkdir $(PFM) 463 mkdir -p $(PFM)
466 test -d $(PFM)/$(VARIETY) || mkdir $(PFM)/$(VARIETY) 464 mkdir -p $(PFM)/$(VARIETY)
467 $(gendep) 465 $(gendep)
468 466
469ifdef VARIETY 467ifdef VARIETY
470ifdef TARGET 468ifdef TARGET
469
470# %%VARIETY: When adding a new variety, add the dependencies files for it
471# here.
472ifeq ($(VARIETY),rash)
473include $(PFM)/$(VARIETY)/mps.d
474else
475ifeq ($(VARIETY),hot)
476include $(PFM)/$(VARIETY)/mps.d
477else
471# %%PART: When adding a new part, add the dependency file macro for the new 478# %%PART: When adding a new part, add the dependency file macro for the new
472# part here. 479# part here.
473include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) \ 480include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) \
@@ -477,6 +484,9 @@ endif
477endif 484endif
478 485
479endif 486endif
487endif
488
489endif
480 490
481# Library 491# Library
482 492