mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-26 13:05:18 +01:00
If doing buildworld -DWITH_BMAKE make sure bmake does the build.
This commit is contained in:
parent
c0bc8af9b7
commit
13c9cf4c53
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=249395
8
Makefile
8
Makefile
@ -281,6 +281,9 @@ kernel: buildkernel installkernel
|
||||
#
|
||||
upgrade_checks:
|
||||
.if !defined(.PARSEDIR)
|
||||
.if defined(WITH_BMAKE)
|
||||
(cd ${.CURDIR} && ${MAKE} bmake)
|
||||
.else
|
||||
@if ! (cd ${.CURDIR}/tools/build/make_check && \
|
||||
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
|
||||
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
|
||||
@ -288,6 +291,7 @@ upgrade_checks:
|
||||
(cd ${.CURDIR} && ${MAKE} make); \
|
||||
fi
|
||||
.endif
|
||||
.endif
|
||||
|
||||
#
|
||||
# Upgrade make(1) to the current version using the installed
|
||||
@ -302,12 +306,12 @@ MMAKE= ${MMAKEENV} ${MAKE} \
|
||||
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
|
||||
-DNO_CPU_CFLAGS -DNO_WERROR
|
||||
|
||||
make: .PHONY
|
||||
make bmake: .PHONY
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------"
|
||||
@echo ">>> Building an up-to-date make(1)"
|
||||
@echo "--------------------------------------------------------------"
|
||||
${_+_}@cd ${.CURDIR}/usr.bin/make; \
|
||||
${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
|
||||
${MMAKE} obj && \
|
||||
${MMAKE} depend && \
|
||||
${MMAKE} all && \
|
||||
|
Loading…
Reference in New Issue
Block a user