From owner-svn-src-all@FreeBSD.ORG  Fri Feb 11 04:03:40 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48B151065670;
	Fri, 11 Feb 2011 04:03:40 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 37DE58FC0A;
	Fri, 11 Feb 2011 04:03:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1B43eRZ044656;
	Fri, 11 Feb 2011 04:03:40 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B43ehI044654;
	Fri, 11 Feb 2011 04:03:40 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201102110403.p1B43ehI044654@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 Feb 2011 04:03:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218534 - head
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Feb 2011 04:03:40 -0000

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: