--- branches/magellan-next/extras/nss/nss-3.12.11-r1.smage2	2011/09/19 22:13:55	9007
+++ branches/magellan-next/extras/nss/nss-3.12.11-r1.smage2	2011/09/19 22:26:41	9008
@@ -42,24 +42,33 @@
 
 src_compile()
 {
-	cd ${SRCDIR}
-
-	[[ ${ARCH} = x86_64 ]] && export USE_64=1
-
-	# use system sqlite
-	export NSS_USE_SYSTEM_SQLITE=1
-
-	export FREEBL_NO_DEPEND=1
-	export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-	export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-
-	# get the right nspr includes and libs on multilib systems
-	export NSPR_INCLUDE_DIR=$(pkg-config --cflags-only-I nspr | sed 's:-I::')
-	export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's:-L::')
-
-	mmake -j1 BUILD_OPT=1 CC='${CC}' -C mozilla/security/coreconf || die
-	mmake -j1 BUILD_OPT=1 CC='${CC}' -C mozilla/security/dbm || die
-	mmake -j1 BUILD_OPT=1 CC='${CC}' -C mozilla/security/nss || die
+	local abi
+	for abi in ${MULTILIB_ABIS}
+	do
+		case ${abi} in
+			m32) ABI="m32"; ABI_LIBDIR="lib";;
+			m64) ABI="m64"; ABI_LIBDIR="lib64";;
+		esac
+		cd ${SRCDIR}-${abi}
+
+		[[ ${abi} = m64 ]] && export USE_64=1
+
+		# use system sqlite
+		export NSS_USE_SYSTEM_SQLITE=1
+
+		export FREEBL_NO_DEPEND=1
+		export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+		export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+
+		# get the right nspr includes and libs on multilib systems
+		export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig"
+		export NSPR_INCLUDE_DIR=$(pkg-config --cflags-only-I nspr | sed 's:-I::')
+		export NSPR_LIB_DIR=$(pkg-config --libs-only-L nspr | sed 's:-L::')
+
+		make -j1 BUILD_OPT=1 CC="gcc -${ABI}" -C mozilla/security/coreconf || die
+		make -j1 BUILD_OPT=1 CC="gcc -${ABI}" -C mozilla/security/dbm || die
+		make -j1 BUILD_OPT=1 CC="gcc -${ABI}" -C mozilla/security/nss || die
+	done
 }
 
 src_install()