--- trunk/include/multilib.sminc	2017/10/12 07:24:27	29786
+++ trunk/include/multilib.sminc	2017/10/12 08:49:24	29788
@@ -400,6 +400,28 @@
 }
 fi
 
+if [[ ! -z $(typeset -f mninja) ]]
+then
+	# rename the old one
+	old_mninja=old$(typeset -f mninja)
+	eval "${old_mninja}"
+
+mninja()
+{
+	local abi
+	local abis_to_run="${MULTILIB_ABIS}"
+
+	# respect MULTILIB_ONLY_ABI variable
+	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
+
+	for abi in ${abis_to_run}
+	do
+		echo -e "${COLBLUE}*** ${COLGREEN}compiling for ABI -${abi}${COLDEFAULT}"
+		cd ${SRCDIR}-${abi}/${SRCSUBDIR}
+		abi-${abi} oldmninja $@ || die
+	done
+}
+fi
 
 if [[ ! -z $(typeset -f meson_configure) ]]
 then
@@ -462,7 +484,7 @@
 	for abi in ${abis_to_run}
 	do
 		cd ${BUILDDIR}/build-${abi}
-		abi-${abi} ninja $@ || die
+		abi-${abi} oldmninja $@ || die
 	done
 }
 fi
@@ -518,12 +540,11 @@
 		else
 			cd ${SRCDIR}-${abi}
 		fi
-		abi-${abi} DESTDIR=${BINDIR} ninja $@ install || die
+		abi-${abi} DESTDIR=${BINDIR} oldmninja $@ install || die
 	done
 }
 fi
 
-
 if [[ ! -z $(typeset -f munpack) ]]
 then
 	# rename the old one