@@ -176,7 +176,7 @@ G=$(GENERATED)
176
176
# Last released versions
177
177
DMD_LATEST_DIR =$G/dmd-${LATEST}
178
178
DMD_LATEST =$(DMD_LATEST_DIR ) /generated/$(OS ) /release/$(MODEL ) /dmd
179
- DRUNTIME_LATEST_DIR =$G/druntime -${LATEST}
179
+ DRUNTIME_LATEST_DIR =$G/dmd -${LATEST}/druntime
180
180
PHOBOS_LATEST_DIR =$G/phobos-${LATEST}
181
181
182
182
# stable dub and dmd versions used to build dpl-docs
@@ -431,10 +431,9 @@ ${GENERATED}/modlist-prerelease.ddoc : tools/modlist.d ${STABLE_DMD} $(DRUNTIME_
431
431
$(addprefix --dump , object std etc core dmd rt core.internal.array core.internal.util) > $@
432
432
433
433
# Run "make -j rebase" for rebasing all dox in parallel!
434
- rebase : rebase-dlang rebase-dmd rebase-druntime rebase- phobos
434
+ rebase : rebase-dlang rebase-dmd rebase-phobos
435
435
rebase-dlang : ; $(call REBASE,dlang.org)
436
436
rebase-dmd : ; cd $(DMD_DIR ) && $(call REBASE,dmd)
437
- rebase-druntime : ; cd $(DRUNTIME_DIR ) && $(call REBASE,druntime)
438
437
rebase-phobos : ; cd $(PHOBOS_DIR ) && $(call REBASE,phobos)
439
438
440
439
clean :
@@ -575,12 +574,16 @@ $G/dblog_latest.ddoc: $G/dblog_latest.xml $(STABLE_DMD) tools/ddoc_xml_extractor
575
574
# Git rules
576
575
# ###############################################################################
577
576
577
+ # Druntime is in the DMD repository.
578
+ ${DRUNTIME_DIR} : ${DMD_DIR}
579
+ ${DRUNTIME_LATEST_DIR} : ${DMD_LATEST_DIR}
580
+
578
581
# Clone snapshots of the latest official release of all main D repositories
579
582
$G/% -${LATEST} :
580
583
git clone -b v${LATEST} --depth=1 ${GIT_HOME} /$(notdir $* ) $@
581
584
582
585
# Clone all main D repositories
583
- ${DMD_DIR} ${DRUNTIME_DIR} ${ PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR} ${DUB_DIR} :
586
+ ${DMD_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR} ${DUB_DIR} :
584
587
git clone ${GIT_HOME} /$(notdir $(@F ) ) $@
585
588
586
589
${DMD_DIR}/VERSION : ${DMD_DIR}
0 commit comments