d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't assume that make(1) is a bsd-like make program. It might not be. This

Browse Source 
only matters in the early stages of bootstrapping, of course, but gnu make can't
handle bsd make Makefiles at all if they use any of the 'dot' directives, which
src/Makefile has in abudnance.
This commit is contained in:
Warner Losh 2007-12-11 20:00:55 +00:00
parent a8a27cb0f9
commit 6029ad9932
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -234,17 +234,19 @@ upgrade_checks:
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \ then \
(cd ${.CURDIR} && make make); \ (cd ${.CURDIR} && ${BSDMAKE} make); \
fi fi
# #
# Upgrade make(1) to the current version using the installed # Upgrade make(1) to the current version using the installed
# headers, libraries and tools. # headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden.
# #
BSDMAKE?=make
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \ DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh" INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} make \ MMAKE= ${MMAKEENV} ${BSDMAKE} \
-D_UPGRADING \ -D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR -DNO_CPU_CFLAGS -DNO_WERROR