aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2011-02-02 23:59:24 +0000
committerWarner Losh <imp@FreeBSD.org>2011-02-02 23:59:24 +0000
commitb3840844f2ca349bb7e2c68d69c9201437a6e959 (patch)
treec94f1ffcefc3b01b058dd330715bdb73a4353ba4
parent0df2165c1195c5961528e7ae2a3b9c36aedacd99 (diff)
downloadsrc-b3840844f2ca349bb7e2c68d69c9201437a6e959.tar.gz
src-b3840844f2ca349bb7e2c68d69c9201437a6e959.zip
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.
Notes
Notes: svn path=/head/; revision=218206
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 09cef32da7dd..e942f8a03d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -124,7 +124,7 @@ MAKEPATH= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
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