Skip to content

Commit 4307d6c

Browse files
committed
posix.mak: Update remaining references to $(DMD_[LATEST_]DIR)/src
1 parent 88db29d commit 4307d6c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

posix.mak

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ DUB_DIR=../dub
155155

156156
# Auto-cloning missing directories
157157
$(shell [ ! -d $(DMD_DIR) ] && git clone --depth=1 ${GIT_HOME}/dmd $(DMD_DIR))
158-
include $(DMD_DIR)/src/osmodel.mak
158+
include $(DMD_DIR)/compiler/src/osmodel.mak
159159

160160
# External binaries
161161
DMD=$(DMD_DIR)/generated/$(OS)/release/$(MODEL)/dmd
@@ -593,10 +593,10 @@ ${DMD_DIR}/VERSION : ${DMD_DIR}
593593
################################################################################
594594

595595
$(DMD) : ${DMD_DIR}
596-
${MAKE} --directory=${DMD_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
596+
${MAKE} --directory=${DMD_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
597597

598598
$(DMD_LATEST) : ${DMD_LATEST_DIR}
599-
${MAKE} --directory=${DMD_LATEST_DIR}/src -f posix.mak AUTO_BOOTSTRAP=1
599+
${MAKE} --directory=${DMD_LATEST_DIR}/compiler/src -f posix.mak AUTO_BOOTSTRAP=1
600600
sed -i -e "s|../druntime/import |../../dmd-${LATEST}/druntime/import |" -e "s|../phobos |../phobos-${LATEST} |" $@.conf
601601

602602
dmd-prerelease : $(STD_DDOC_PRERELEASE) druntime-target $G/changelog/next-version
@@ -719,21 +719,21 @@ $W/library-prerelease/.htaccess : dpl_prerelease_htaccess
719719

720720
$G/docs-latest.json : ${DMD_LATEST} ${DMD_LATEST_DIR} \
721721
${DRUNTIME_LATEST_DIR} | dpl-docs
722-
find ${DMD_LATEST_DIR}/src -name '*.d' -o -name '*.di' | sort -r | \
722+
find ${DMD_LATEST_DIR}/compiler/src -name '*.d' -o -name '*.di' | sort -r | \
723723
gawk '!n[gensub(/\.di?$$/, "", 1)]++' > $G/.latest-files.txt
724724
find ${DRUNTIME_LATEST_DIR}/src -name '*.d' | \
725725
sed -e /unittest.d/d -e /gcstub/d >> $G/.latest-files.txt
726726
find ${PHOBOS_LATEST_DIR}/etc ${PHOBOS_LATEST_DIR}/std -name '*.d' | \
727727
sed -e /unittest.d/d | sort >> $G/.latest-files.txt
728-
${DMD_LATEST} -J$(DMD_LATEST_DIR)/src/dmd/res -J$(dir $(DMD_LATEST)) -c -o- -version=CoreDdoc \
728+
${DMD_LATEST} -J$(DMD_LATEST_DIR)/compiler/src/dmd/res -J$(dir $(DMD_LATEST)) -c -o- -version=CoreDdoc \
729729
-version=MARS -version=CoreDdoc -version=StdDdoc -Df$G/.latest-dummy.html \
730730
-Xf$@ -I${PHOBOS_LATEST_DIR} @$G/.latest-files.txt
731731
${DPL_DOCS} ${DPL_DOCS_FLAGS} filter $@ --min-protection=Protected \
732732
--only-documented $(MOD_EXCLUDES_LATEST)
733733
rm -f $G/.latest-files.txt $G/.latest-dummy.html
734734

735735
$G/docs-prerelease.json : ${DMD} ${DMD_DIR} ${DRUNTIME_DIR} | dpl-docs
736-
find ${DMD_DIR}/src -name '*.d' -o -name '*.di' | sort -r | \
736+
find ${DMD_DIR}/compiler/src -name '*.d' -o -name '*.di' | sort -r | \
737737
gawk '!n[gensub(/\.di?$$/, "", 1)]++' > $G/.prerelease-files.txt
738738
find ${DRUNTIME_DIR}/src -name '*.d' | \
739739
sed -e /unittest/d >> $G/.prerelease-files.txt

0 commit comments

Comments
 (0)