diff options
author | imp <imp@FreeBSD.org> | 2011-02-02 23:59:24 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2011-02-02 23:59:24 +0000 |
commit | c70bfd860abd2c13454389a9370dd05336d57790 (patch) | |
tree | c94f1ffcefc3b01b058dd330715bdb73a4353ba4 | |
parent | 0bf07f466d5ab61b8a3fd1f5eaccbca5a8a752d4 (diff) | |
download | FreeBSD-src-c70bfd860abd2c13454389a9370dd05336d57790.zip FreeBSD-src-c70bfd860abd2c13454389a9370dd05336d57790.tar.gz |
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.
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |