Date: Sat, 1 Mar 2014 17:44:41 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262660 - projects/release-embedded/release Message-ID: <201403011744.s21HifpG083123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403011744.s21HifpG083123>