Skip to content

Commit 1760c09

Browse files
kinkedlang-bot
authored andcommitted
Don't use deprecated posix.mak Makefiles for druntime and Phobos
1 parent ce8d345 commit 1760c09

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

posix.mak

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -626,29 +626,29 @@ $W/phobos-prerelease/mars.verbatim: $(STD_DDOC_PRERELEASE) druntime-target \
626626
################################################################################
627627

628628
druntime-target: ${DRUNTIME_DIR} ${DMD}
629-
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak target ${DDOC_VARS_PRERELEASE_HTML}
629+
${MAKE} --directory=${DRUNTIME_DIR} target ${DDOC_VARS_PRERELEASE_HTML}
630630

631631
druntime-latest-target: ${DRUNTIME_LATEST_DIR} ${DMD_LATEST}
632-
${MAKE} --directory=${DRUNTIME_LATEST_DIR} -f posix.mak target ${DDOC_VARS_LATEST_HTML}
632+
${MAKE} --directory=${DRUNTIME_LATEST_DIR} target ${DDOC_VARS_LATEST_HTML}
633633

634634
druntime-prerelease : druntime-target $(STD_DDOC_PRERELEASE) $G/changelog/next-version
635-
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak doc $(DDOC_VARS_PRERELEASE_HTML) \
635+
${MAKE} --directory=${DRUNTIME_DIR} doc $(DDOC_VARS_PRERELEASE_HTML) \
636636
DOCDIR=$W/phobos-prerelease \
637637
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_PRERELEASE))"
638638

639639
druntime-release : druntime-target $(STD_DDOC_RELEASE)
640-
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak doc $(DDOC_VARS_RELEASE_HTML) \
640+
${MAKE} --directory=${DRUNTIME_DIR} doc $(DDOC_VARS_RELEASE_HTML) \
641641
DOCDIR=$W/phobos \
642642
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_RELEASE))"
643643

644644
druntime-latest : druntime-latest-target $(STD_DDOC_LATEST)
645-
${MAKE} --directory=${DRUNTIME_LATEST_DIR} -f posix.mak doc $(DDOC_VARS_LATEST_HTML) \
645+
${MAKE} --directory=${DRUNTIME_LATEST_DIR} doc $(DDOC_VARS_LATEST_HTML) \
646646
DOCDIR=$W/phobos \
647647
DOCFMT="$(addprefix `pwd`/, $(STD_DDOC_LATEST))"
648648

649649
druntime-prerelease-verbatim : $W/phobos-prerelease/object.verbatim
650650
$W/phobos-prerelease/object.verbatim : $(DMD) druntime-target $G/changelog/next-version
651-
${MAKE} --directory=${DRUNTIME_DIR} -f posix.mak target doc $(DDOC_VARS_PRERELEASE_VERBATIM) \
651+
${MAKE} --directory=${DRUNTIME_DIR} target doc $(DDOC_VARS_PRERELEASE_VERBATIM) \
652652
DOCDIR=$W/phobos-prerelease-verbatim \
653653
DOCFMT="`pwd`/verbatim.ddoc"
654654
mkdir -p $(dir $@)
@@ -663,29 +663,29 @@ $W/phobos-prerelease/object.verbatim : $(DMD) druntime-target $G/changelog/next-
663663
.PHONY: phobos-prerelease
664664
phobos-prerelease : druntime-target $(STD_DDOC_PRERELEASE) $(DDOC_BIN) $(DMD) \
665665
$G/changelog/next-version
666-
$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_PRERELEASE_HTML) \
666+
$(MAKE) --directory=$(PHOBOS_DIR) html $(DDOC_VARS_PRERELEASE_HTML) \
667667
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD))"
668668

669669
phobos-release : druntime-target $(STD_DDOC_RELEASE) $(DDOC_BIN) $(DMD)
670-
$(MAKE) --directory=$(PHOBOS_DIR) -f posix.mak html $(DDOC_VARS_RELEASE_HTML) \
670+
$(MAKE) --directory=$(PHOBOS_DIR) html $(DDOC_VARS_RELEASE_HTML) \
671671
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD))"
672672

673673
phobos-latest : druntime-latest-target $(STD_DDOC_LATEST) $(DDOC_BIN) $(DMD_LATEST)
674-
$(MAKE) --directory=$(PHOBOS_LATEST_DIR) -f posix.mak html $(DDOC_VARS_LATEST_HTML) \
674+
$(MAKE) --directory=$(PHOBOS_LATEST_DIR) html $(DDOC_VARS_LATEST_HTML) \
675675
DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD_LATEST))"
676676

677677
phobos-prerelease-verbatim : $W/phobos-prerelease/index.verbatim
678678
$W/phobos-prerelease/index.verbatim : druntime-target verbatim.ddoc \
679679
$W/phobos-prerelease/object.verbatim \
680680
$W/phobos-prerelease/mars.verbatim $G/changelog/next-version $(DMD) $(DDOC_BIN)
681-
${MAKE} --directory=${PHOBOS_DIR} -f posix.mak html $(DDOC_VARS_PRERELEASE_VERBATIM) \
681+
${MAKE} --directory=${PHOBOS_DIR} html $(DDOC_VARS_PRERELEASE_VERBATIM) \
682682
DOC_OUTPUT_DIR=$W/phobos-prerelease-verbatim DMD="$(abspath $(DDOC_BIN)) --compiler=$(abspath $(DMD))"
683683
$(call CHANGE_SUFFIX,html,verbatim,$W/phobos-prerelease-verbatim)
684684
mv $W/phobos-prerelease-verbatim/* $(dir $@)
685685
rm -r $W/phobos-prerelease-verbatim
686686

687687
$(PHOBOS_LIB): $(DMD)
688-
${MAKE} --directory=${PHOBOS_DIR} -f posix.mak lib
688+
${MAKE} --directory=${PHOBOS_DIR} lib
689689

690690
################################################################################
691691
# phobos and druntime, latest released build and current build (DDOX version)

0 commit comments

Comments
 (0)