svn commit: r218534 - head

[Warner Losh]

Author: imp
Date: Fri Feb 11 04:03:39 2011
New Revision: 218534
URL: http://svn.freebsd.org/changeset/base/218534

Log:
  Hmmm, specifying TARGET and TARGET_ARCH in the environment doesn't
  seem to work when building xdev anymore (most likely my changes lately
  moving the TARGET guessing stuff to Makefile from Makefile.inc1, but I
  really don't grok why).  Fix make xdev by putting them on the command
  line.  This will work either way while I try to figure it out.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Feb 11 02:37:47 2011	(r218533)
+++ head/Makefile.inc1	Fri Feb 11 04:03:39 2011	(r218534)
@@ -1439,13 +1439,13 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
 	-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
-	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS
-
-XDDIR=${XDEV}-freebsd
-XDTP=/usr/${XDDIR}
-CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
+	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
+
+XDDIR=${XDEV_ARCH}-freebsd
+XDTP=/usr/${XDDIR}
+CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR}
 CDENV= ${CDBENV} \
 	_SHLIBDIRPREFIX=${XDTP} \
 	TOOLS_PREFIX=${XDTP}
@@ -1467,7 +1467,7 @@ xdev: xdev-build xdev-install
 xdev-build: _xb-build-tools _xb-cross-tools
 
 _xb-build-tools:
-	${_+_}cd ${.CURDIR}; \
+	${_+_}@cd ${.CURDIR}; \
 	${CDBENV} ${MAKE} -f Makefile.inc1 ${NOFUN} build-tools
 
 _xb-cross-tools: