Skip to content

Commit ff78b70

Browse files
CyberShadowPetarKirov
authored andcommitted
make -j fixes - move dependencies down from pseudo-targets
If target T is defined as depending on A, B, and C, and C actually needs A and B to build correctly, then A and B need to be listed as dependencies of C, not T - otherwise, make will build A/B in parallel to (or even after) C when running in multiple threads.
1 parent c12939a commit ff78b70

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

posix.mak

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -608,9 +608,9 @@ dmd-release : $(STD_DDOC_RELEASE) druntime-target
608608
dmd-latest : $(STD_DDOC_LATEST) druntime-latest-target
609609
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML)
610610

611-
dmd-prerelease-verbatim : $(STD_DDOC_PRERELEASE) druntime-target \
612-
$W/phobos-prerelease/mars.verbatim
613-
$W/phobos-prerelease/mars.verbatim: verbatim.ddoc $G/changelog/next-version
611+
dmd-prerelease-verbatim : $W/phobos-prerelease/mars.verbatim
612+
$W/phobos-prerelease/mars.verbatim: $(STD_DDOC_PRERELEASE) druntime-target \
613+
verbatim.ddoc $G/changelog/next-version
614614
mkdir -p $(dir $@)
615615
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_VERBATIM)
616616
$(call CHANGE_SUFFIX,html,verbatim,$W/phobos-prerelease-verbatim)
@@ -643,9 +643,8 @@ druntime-latest : druntime-latest-target $(STD_DDOC_LATEST)
643643
DOCDIR=$W/phobos \
644644
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_LATEST))"
645645

646-
druntime-prerelease-verbatim : druntime-target \
647-
$W/phobos-prerelease/object.verbatim
648-
$W/phobos-prerelease/object.verbatim : $(DMD) $G/changelog/next-version
646+
druntime-prerelease-verbatim : $W/phobos-prerelease/object.verbatim
647+
$W/phobos-prerelease/object.verbatim : $(DMD) druntime-target $G/changelog/next-version
649648
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak target doc $(DDOC_VARS_PRERELEASE_VERBATIM) \
650649
DOCDIR=$W/phobos-prerelease-verbatim \
651650
DOCFMT="`pwd`/verbatim.ddoc"
@@ -672,9 +671,8 @@ phobos-latest : druntime-latest-target $(STD_DDOC_LATEST) $(DDOC_BIN) $(DMD_LATE
672671
$(MAKE) --directory=$(PHOBOS_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) \
673672
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD_LATEST))"
674673

675-
phobos-prerelease-verbatim : druntime-target \
676-
$W/phobos-prerelease/index.verbatim
677-
$W/phobos-prerelease/index.verbatim : verbatim.ddoc \
674+
phobos-prerelease-verbatim : $W/phobos-prerelease/index.verbatim
675+
$W/phobos-prerelease/index.verbatim : druntime-target verbatim.ddoc \
678676
$W/phobos-prerelease/object.verbatim \
679677
$W/phobos-prerelease/mars.verbatim $G/changelog/next-version $(DMD) $(DDOC_BIN)
680678
${MAKE} --directory=${PHOBOS_DIR} -f posix.mak html $(DDOC_VARS_PRERELEASE_VERBATIM) \

0 commit comments

Comments
 (0)