Skip to content

Commit 9de265a

Browse files
kinkedlang-bot
authored andcommitted
Avoid deprecated compiler Makefiles
Use build.d instead, via the bootstrap.sh wrapper.
1 parent 8a46aef commit 9de265a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

posix.mak

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -593,27 +593,29 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
593593
# dmd compiler, latest released build and current build
594594
################################################################################
595595

596+
BUILD_JOBS_ARG:=$(if $(BUILD_JOBS),-j$(BUILD_JOBS),)
597+
596598
$(DMD) : ${DMD_DIR}
597-
${MAKE} --directory=${DMD_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1 BUILD_JOBS=$(BUILD_JOBS)
599+
bash ${DMD_DIR}/compiler/src/bootstrap.sh $(BUILD_JOBS_ARG)
598600

599601
$(DMD_LATEST) : ${DMD_LATEST_DIR}
600-
${MAKE} --directory=${DMD_LATEST_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1 BUILD_JOBS=$(BUILD_JOBS)
602+
bash ${DMD_LATEST_DIR}/compiler/src/bootstrap.sh $(BUILD_JOBS_ARG)
601603
sed -i -e "s|../druntime/import |../../dmd-${LATEST}/druntime/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf
602604

603605
dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
604-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML) BUILD_JOBS=$(BUILD_JOBS)
606+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_PRERELEASE_HTML) $(BUILD_JOBS_ARG)
605607

606608
dmd-release : $(STD_DDOC_RELEASE) druntime-target
607-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML) BUILD_JOBS=$(BUILD_JOBS)
609+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_RELEASE_HTML) $(BUILD_JOBS_ARG)
608610

609611
dmd-latest : $(STD_DDOC_LATEST) druntime-latest-target
610-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) BUILD_JOBS=$(BUILD_JOBS)
612+
bash $(DMD_LATEST_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_LATEST_HTML) $(BUILD_JOBS_ARG)
611613

612614
dmd-prerelease-verbatim : $W/phobos-prerelease/mars.verbatim
613615
$W/phobos-prerelease/mars.verbatim: $(STD_DDOC_PRERELEASE) druntime-target \
614616
verbatim.ddoc $G/changelog/next-version
615617
mkdir -p $(dir $@)
616-
$(MAKE) AUTO_BOOTSTRAP=1 --directory=$(DMD_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_VERBATIM)
618+
bash $(DMD_DIR)/compiler/src/bootstrap.sh html $(DDOC_VARS_PRERELEASE_VERBATIM)
617619
$(call CHANGE_SUFFIX,html,verbatim,$W/phobos-prerelease-verbatim)
618620
mv $W/phobos-prerelease-verbatim/* $(dir $@)
619621
rm -r $W/phobos-prerelease-verbatim

0 commit comments

Comments
 (0)