Skip to content

Commit 297f2d0

Browse files
committed
posix.mak: Don't attempt to clone Druntime
1 parent 755cac1 commit 297f2d0

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

posix.mak

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ G=$(GENERATED)
176176
# Last released versions
177177
DMD_LATEST_DIR=$G/dmd-${LATEST}
178178
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
180180
PHOBOS_LATEST_DIR=$G/phobos-${LATEST}
181181

182182
# stable dub and dmd versions used to build dpl-docs
@@ -431,10 +431,9 @@ ${GENERATED}/modlist-prerelease.ddoc : tools/modlist.d ${STABLE_DMD} $(DRUNTIME_
431431
$(addprefix --dump , object std etc core dmd rt core.internal.array core.internal.util) >$@
432432

433433
# 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
435435
rebase-dlang: ; $(call REBASE,dlang.org)
436436
rebase-dmd: ; cd $(DMD_DIR) && $(call REBASE,dmd)
437-
rebase-druntime: ; cd $(DRUNTIME_DIR) && $(call REBASE,druntime)
438437
rebase-phobos: ; cd $(PHOBOS_DIR) && $(call REBASE,phobos)
439438

440439
clean:
@@ -575,12 +574,16 @@ $G/dblog_latest.ddoc: $G/dblog_latest.xml $(STABLE_DMD) tools/ddoc_xml_extractor
575574
# Git rules
576575
################################################################################
577576

577+
# Druntime is in the DMD repository.
578+
${DRUNTIME_DIR}: ${DMD_DIR}
579+
${DRUNTIME_LATEST_DIR}: ${DMD_LATEST_DIR}
580+
578581
# Clone snapshots of the latest official release of all main D repositories
579582
$G/%-${LATEST} :
580583
git clone -b v${LATEST} --depth=1 ${GIT_HOME}/$(notdir $*) $@
581584

582585
# 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}:
584587
git clone ${GIT_HOME}/$(notdir $(@F)) $@
585588

586589
${DMD_DIR}/VERSION : ${DMD_DIR}

0 commit comments

Comments
 (0)