mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-14 10:09:48 +00:00
Makefile.inc1 rev. 1.341 broke release.5 -- the fuss with MAKEFLAGS
here interferenced with one in Makefile.inc1. Since we can't avoid the jugglery in Makefile.inc1 (we want -m /usr/src/tools/build/mk to come first, before any other -m specified on the command line), avoid it here. Reported by: imp
This commit is contained in:
parent
71d66ceb2c
commit
10646d5f83
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=113505
@ -287,8 +287,6 @@ BOOTABLE="-b"
|
||||
DOCREL= doc.1 doc.2
|
||||
.endif
|
||||
|
||||
TMAKE!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
|
||||
cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE
|
||||
WMAKEENV!= echo MAKEFLAGS=\"-m ${.CURDIR}/../share/mk\"; \
|
||||
cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV
|
||||
WMAKE= ${WMAKEENV} ${MAKE}
|
||||
@ -564,7 +562,8 @@ release.5:
|
||||
cd ${j}_crunch; ${WMAKEENV} crunchgen -o ${.CURDIR}/${j}_crunch.conf
|
||||
.endif
|
||||
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
|
||||
cd ${.CURDIR}/..; ${TMAKE} build-tools
|
||||
cd ${.CURDIR}/..; ${MAKE} -m ${.CURDIR}/../share/mk -f Makefile.inc1 \
|
||||
_build-tools
|
||||
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk \
|
||||
CFLAGS="-Os -pipe" -DNO_CPU_CFLAGS all
|
||||
${WMAKEENV} strip -R .comment ${j}_crunch/${j}_crunch
|
||||
|
Loading…
Reference in New Issue
Block a user