--- trunk/include/multilib.sminc	2012/04/18 21:41:58	11827
+++ trunk/include/multilib.sminc	2012/10/10 09:13:52	13488
@@ -105,7 +105,7 @@
 			echo -e "${COLBLUE}*** ${COLGREEN}  EMUL_LINUX_32${COLDEFAULT}='${EMUL_LINUX_32}'"
 		fi
 		uname(){ linux32 uname $@; } && export -f uname
-		ORIG_CHOST="${CHOST}" && export CHOST="i686-pc-linux-gnu"
+		local orig_chost="${CHOST}" && export CHOST="i686-pc-linux-gnu"
 	fi
 	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
@@ -124,7 +124,7 @@
 	if [[ ${EMUL_LINUX_32} = true ]]
 	then
 		unset uname
-		export CHOST="${ORIG_CHOST}" && unset ORIG_CHOST
+		export CHOST="${orig_chost}" && unset orig_chost
 	fi
 }
 
@@ -237,6 +237,21 @@
 	echo "\"g++ -\${ABI}\""
 }
 
+mabi-cflags()
+{
+	echo "\"\${CFLAGS}\""
+}
+
+mabi-cxxflags()
+{
+	echo "\"\${CXXFLAGS}\""
+}
+
+mabi-ldflags()
+{
+	echo "\"\${LDFLAGS}\""
+}
+
 ##
 # multilib compile functions
 ##
@@ -304,7 +319,7 @@
 	for abi in ${abis_to_run}
 	do
 		echo -e "${COLBLUE}*** ${COLGREEN}unpacking for ABI -${abi}${COLDEFAULT}"
-		oldmunpack ${SRCFILE} || die
+		oldmunpack $@ || die
 		mv ${SRCDIR} ${SRCDIR}-${abi} || die
 	done
 }