@@ -593,27 +593,29 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
593
593
# dmd compiler, latest released build and current build
594
594
# ###############################################################################
595
595
596
+ BUILD_JOBS_ARG: =$(if $(BUILD_JOBS ) ,-j$(BUILD_JOBS ) ,)
597
+
596
598
$(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 )
598
600
599
601
$(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 )
601
603
sed -i -e " s|../druntime/import |../../dmd-${LATEST} /druntime/import |" -e " s|../phobos |../phobos-${LATEST} |" $@ .conf
602
604
603
605
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 )
605
607
606
608
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 )
608
610
609
611
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 )
611
613
612
614
dmd-prerelease-verbatim : $W/phobos-prerelease/mars.verbatim
613
615
$W/phobos-prerelease/mars.verbatim : $(STD_DDOC_PRERELEASE ) druntime-target \
614
616
verbatim.ddoc $G /changelog/next-version
615
617
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 )
617
619
$(call CHANGE_SUFFIX,html,verbatim,$W/phobos-prerelease-verbatim)
618
620
mv $W /phobos-prerelease-verbatim/* $(dir $@ )
619
621
rm -r $W /phobos-prerelease-verbatim
0 commit comments