Date: Wed, 2 Feb 2011 23:59:24 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r218206 - head Message-ID: <201102022359.p12NxOhO026849@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Feb 2 23:59:24 2011 New Revision: 218206 URL: http://svn.freebsd.org/changeset/base/218206 Log: Setting TARGET and TARGET_ARCH needs to be done in _MAKE, not in the TGTS rule as _MAKE is used elsewhere. This should fix make world. Modified: head/Makefile Modified: head/Makefile ============================================================================== --- head/Makefile Wed Feb 2 22:03:18 2011 (r218205) +++ head/Makefile Wed Feb 2 23:59:24 2011 (r218206) @@ -124,7 +124,7 @@ MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/ BINMAKE= \ `if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \ -m ${.CURDIR}/share/mk -_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 +_MAKE= PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} # Guess machine architecture from machine type, and vice versa. .if !defined(TARGET_ARCH) && defined(TARGET) @@ -205,7 +205,7 @@ cleanworld: # ${TGTS}: - ${_+_}cd ${.CURDIR}; ${_MAKE} TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH} ${.TARGET} + ${_+_}@cd ${.CURDIR}; ${_MAKE} ${.TARGET} # Set a reasonable default .MAIN: all
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102022359.p12NxOhO026849>