Remove support for WITHOUT_BMAKE. bmake is now the only make that can
build world, so it is the only make we build or install. fmake is still in the tree, but disconnected, and upgrades from older systems that still have bmake has not been removed, but its state has not been tested (it should work given how minimal the work to upgrade to bmake is).
This commit is contained in:
parent
a46954e28e
commit
d03127447d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=265423
6
Makefile
6
Makefile
@ -139,11 +139,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \
|
|||||||
# Choices add to complexity though.
|
# Choices add to complexity though.
|
||||||
# We cannot blindly use a make which may not be the one we want
|
# We cannot blindly use a make which may not be the one we want
|
||||||
# so be exlicit - until all choice is removed.
|
# so be exlicit - until all choice is removed.
|
||||||
.if !defined(WITHOUT_BMAKE)
|
|
||||||
WANT_MAKE= bmake
|
WANT_MAKE= bmake
|
||||||
.else
|
|
||||||
WANT_MAKE= fmake
|
|
||||||
.endif
|
|
||||||
MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
|
MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
|
||||||
.if defined(.PARSEDIR)
|
.if defined(.PARSEDIR)
|
||||||
HAVE_MAKE= bmake
|
HAVE_MAKE= bmake
|
||||||
@ -152,7 +148,7 @@ HAVE_MAKE= fmake
|
|||||||
.endif
|
.endif
|
||||||
.if exists(${MYMAKE})
|
.if exists(${MYMAKE})
|
||||||
SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
|
SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
|
||||||
.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
|
.elif ${WANT_MAKE} != ${HAVE_MAKE}
|
||||||
# It may not exist yet but we may cause it to.
|
# It may not exist yet but we may cause it to.
|
||||||
# In the case of fmake, upgrade_checks may cause a newer version to be built.
|
# In the case of fmake, upgrade_checks may cause a newer version to be built.
|
||||||
SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
|
SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
|
||||||
|
@ -65,7 +65,6 @@ __DEFAULT_YES_OPTIONS = \
|
|||||||
BINUTILS \
|
BINUTILS \
|
||||||
BINUTILS_BOOTSTRAP \
|
BINUTILS_BOOTSTRAP \
|
||||||
BLUETOOTH \
|
BLUETOOTH \
|
||||||
BMAKE \
|
|
||||||
BOOT \
|
BOOT \
|
||||||
BSD_CPIO \
|
BSD_CPIO \
|
||||||
BSNMP \
|
BSNMP \
|
||||||
|
@ -279,11 +279,7 @@ SUBDIR+= msgs
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_MAKE} != "no"
|
.if ${MK_MAKE} != "no"
|
||||||
.if ${MK_BMAKE} != "no"
|
|
||||||
SUBDIR+= bmake
|
SUBDIR+= bmake
|
||||||
.else
|
|
||||||
SUBDIR+= make
|
|
||||||
.endif
|
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if ${MK_MAN_UTILS} != "no"
|
.if ${MK_MAN_UTILS} != "no"
|
||||||
|
@ -7,15 +7,7 @@
|
|||||||
.export SRCTOP
|
.export SRCTOP
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
# Sadly, we cannot assume src.opts.mk did its job,
|
|
||||||
# nor can we safely include the one we want
|
|
||||||
.if !defined(WITHOUT_BMAKE)
|
|
||||||
MK_BMAKE= yes
|
|
||||||
.endif
|
|
||||||
|
|
||||||
.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
|
|
||||||
PROG= make
|
PROG= make
|
||||||
.endif
|
|
||||||
|
|
||||||
.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
|
.if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no"
|
||||||
NO_SHARED?= YES
|
NO_SHARED?= YES
|
||||||
|
@ -111,12 +111,10 @@ CFLAGS+= -DDEFSHELLNAME=\"${MAKE_SHELL}\"
|
|||||||
.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
|
.error "MAKE_SHELL must be set to one of \"csh\", \"sh\" or \"ksh\"."
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
.if defined(MK_BMAKE) && ${MK_BMAKE} != "no"
|
|
||||||
# if we are here we don't want this called 'make'
|
# if we are here we don't want this called 'make'
|
||||||
PROG= fmake
|
PROG= fmake
|
||||||
fmake.1: make.1
|
fmake.1: make.1
|
||||||
cp ${.ALLSRC} ${.TARGET}
|
cp ${.ALLSRC} ${.TARGET}
|
||||||
.endif
|
|
||||||
|
|
||||||
.if ${MK_TESTS} != "no"
|
.if ${MK_TESTS} != "no"
|
||||||
SUBDIR+= tests
|
SUBDIR+= tests
|
||||||
|
Loading…
Reference in New Issue
Block a user