--- trunk/include/meson.sminc	2018/12/03 08:41:37	31578
+++ trunk/include/meson.sminc	2018/12/03 09:18:38	31579
@@ -90,9 +90,19 @@
 
 mninja()
 {
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
 	if [[ ${MULTILIB_BUILD} = true ]]
 	then
-		all-abis ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
+		for abi in ${abis_to_run}
+		do
+			echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
+			abi-${abi} ninja -C ${SRCDIR}-$(mabi)/${SRCSUBDIR} -C ${BUILDDIR}/build-$(mabi) -v ${MAKEOPTS} "$@"
+		done
 	else
 		ninja -C ${SRCDIR}/${SRCSUBDIR} -C ${BUILDDIR}/build -v ${MAKEOPTS} "$@"
 	fi
@@ -100,9 +110,19 @@
 
 meson_setup_builddir()
 {
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
 	if [[ ${MULTILIB_BUILD} = true ]]
 	then
-		all-abis install -d ${BUILDDIR}/build-$(mabi) || die
+		for abi in ${abis_to_run}
+		do
+			echo -e "${COLBLUE}*** ${COLGREEN}running ninja for ABI -${abi}${COLDEFAULT}"
+			abi-${abi} install -d ${BUILDDIR}/build-$(mabi) || die
+		done
 	else
 		install -d ${BUILDDIR}/build || die
 	fi