From owner-svn-src-projects@FreeBSD.ORG  Sat Mar  1 17:44:41 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 823AD771;
 Sat,  1 Mar 2014 17:44:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F1B91D9E;
 Sat,  1 Mar 2014 17:44:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s21HifNX083124;
 Sat, 1 Mar 2014 17:44:41 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s21HifpG083123;
 Sat, 1 Mar 2014 17:44:41 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201403011744.s21HifpG083123@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 1 Mar 2014 17:44:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262660 - projects/release-embedded/release
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Mar 2014 17:44:41 -0000

Author: gjb
Date: Sat Mar  1 17:44:40 2014
New Revision: 262660
URL: http://svnweb.freebsd.org/changeset/base/262660

Log:
  If building i386/i386 on amd64/amd64, append TARGET=i386 and
  TARGET_ARCH=i386 to CHROOT_MAKEENV, ensuring the i386 build
  is done within a true i386 build environment.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-embedded/release/release.sh

Modified: projects/release-embedded/release/release.sh
==============================================================================
--- projects/release-embedded/release/release.sh	Sat Mar  1 17:36:10 2014	(r262659)
+++ projects/release-embedded/release/release.sh	Sat Mar  1 17:44:40 2014	(r262660)
@@ -147,6 +147,13 @@ else
 	ARCH_FLAGS=
 fi
 CHROOT_MAKEENV="MAKEOBJDIRPREFIX=${CHROOTDIR}/tmp/obj"
+if [ ! -z ${TARGET} ] && [ ! -z ${TARGET_ARCH} ] && \
+	[ ${TARGET} = "i386" ] && \
+	[ ${TARGET_ARCH} = "i386" ] && \
+	[ "$(sysctl -n hw.machine)" = "amd64" ] && \
+	[ "$(sysctl -n hw.machine_arch)" = "amd64" ]; then
+		CHROOT_MAKEENV="${CHROOT_MAKEENV} TARGET=i386 TARGET_ARCH=i386"
+fi
 CHROOT_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${CONF_FILES}"
 CHROOT_IMAKEFLAGS="${CONF_FILES}"
 CHROOT_DMAKEFLAGS="${CONF_FILES}"