diff options
| author | Warner Losh <imp@FreeBSD.org> | 2007-12-11 20:00:55 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2007-12-11 20:00:55 +0000 |
| commit | 6029ad99329a4a86b459374d8cbde64e0791d022 (patch) | |
| tree | b66dc99a970edd3dcb00c878a9e7fb2b3006dfa8 /Makefile | |
| parent | a8a27cb0f9cff2ac38416c54e7a3a50e48c078a9 (diff) | |
| download | src-6029ad99329a4a86b459374d8cbde64e0791d022.tar.gz src-6029ad99329a4a86b459374d8cbde64e0791d022.zip | |
Don't assume that make(1) is a bsd-like make program. It might not be. This
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.
Notes
Notes:
svn path=/head/; revision=174539
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -234,17 +234,19 @@ upgrade_checks: PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${BSDMAKE} make); \ fi # # 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} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${BSDMAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR |