build: more cleanups to allow simple cross-builds

build/base.sh

@@ -46,7 +46,9 @@ sh ./clean.sh ${SELF}
 
 setup_stage ${STAGEDIR}
 
-MAKE_ARGS="SRCCONF=${CONFIGDIR}/src.conf COMPILER_TYPE=clang __MAKE_CONF="
+MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
+MAKE_ARGS="${MAKE_ARGS} SRCCONF=${CONFIGDIR}/src.conf __MAKE_CONF="
+
 ENV_FILTER="env -i USER=${USER} LOGNAME=${LOGNAME} HOME=${HOME} \
 SHELL=${SHELL} BLOCKSIZE=${BLOCKSIZE} MAIL=${MAIL} PATH=${PATH} \
 TERM=${TERM} HOSTTYPE=${HOSTTYPE} VENDOR=${VENDOR} OSTYPE=${OSTYPE} \

build/common.sh

@@ -45,8 +45,8 @@ while getopts a:C:c:d:f:K:k:L:l:m:n:o:P:p:R:S:s:T:t:U:u:v: OPT; do
 	a)
 		case "${OPTARG}" in
 		amd64|i386)
-			export PRODUCT_SUBARCH=${OPTARG##*:}
-			export PRODUCT_ARCH=${OPTARG%%:*}
+			export PRODUCT_TARGET=${OPTARG%%:*}
+			export PRODUCT_ARCH=${OPTARG##*:}
 			SCRUB_ARGS=${SCRUB_ARGS};shift;shift
 			;;
 		*)
@@ -187,10 +187,7 @@ fi
 # misc. foo
 export CPUS=$(sysctl kern.smp.cpus | awk '{ print $2 }')
 export CONFIG_XML="/usr/local/etc/config.xml"
-export TARGET_ARCH=${PRODUCT_ARCH}
-export TARGETARCH=${PRODUCT_ARCH}
 export LABEL=${PRODUCT_NAME}
-export XARCH=$(uname -m)
 
 # define build and config directories
 export CONFIGDIR="${TOOLSDIR}/config/${PRODUCT_SETTINGS}"

build/kernel.sh

@@ -46,9 +46,10 @@ sh ./clean.sh ${SELF}
 
 BUILD_KERNEL="SMP"
 
-cp ${CONFIGDIR}/${BUILD_KERNEL} ${SRCDIR}/sys/${PRODUCT_ARCH}/conf/${BUILD_KERNEL}
+cp ${CONFIGDIR}/${BUILD_KERNEL} ${SRCDIR}/sys/${PRODUCT_TARGET}/conf/${BUILD_KERNEL}
 
-MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} KERNCONF=${BUILD_KERNEL}"
+MAKE_ARGS="TARGET_ARCH=${PRODUCT_ARCH} TARGET=${PRODUCT_TARGET}"
+MAKE_ARGS="${MAKE_ARGS} KERNCONF=${BUILD_KERNEL} __MAKE_CONF="
 
 make -s -C${SRCDIR} -j${CPUS} buildkernel ${MAKE_ARGS} NO_KERNELCLEAN=yes
 make -s -C${SRCDIR}/release obj ${MAKE_ARGS}

build/ports.sh

@@ -59,8 +59,6 @@ trap : 2
 if ! chroot ${STAGEDIR} /bin/sh -es << EOF; then SELF=; fi
 # overwrites the ports tree variable, behaviour is unwanted...
 unset STAGEDIR
-# ...and this unbreaks the nmap build
-unset TARGET_ARCH
 
 if pkg -N; then
 	# no need to rebuild