--- trunk/include/multilib.sminc	2018/12/18 13:15:14	31848
+++ trunk/include/multilib.sminc	2018/12/20 13:40:54	31852
@@ -82,6 +82,15 @@
 	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
 	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
+	# honor rust
+	case ${ARCH} in
+		# use native abi as RUST_TARGET
+		i686) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
+		# use i686 as RUST_TARGET for i{3,4,5}86 targets and on multilib-x86_64 target too
+		i*86|x86_64) export RUST_TARGET="i686-unknown-linux-gnu" ;;
+		*)  die "unknown RUST_TARGET '${ARCH}'" ;;
+	esac
+
 	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
 		echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
@@ -122,7 +131,7 @@
 	fi
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR
+	unset ABI CC CXX ABI_LIBDIR RUST_TARGET
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
 	export LDFLAGS="${saved_ldflags}"
@@ -150,6 +159,13 @@
 	local orig_pkg_config_path="${PKG_CONFIG_PATH}"
 	export PKG_CONFIG_PATH="/usr/${ABI_LIBDIR}/pkgconfig:${PKG_CONFIG_PATH}"
 
+	# honor rust
+	case ${ARCH} in
+		# use native abi as RUST_TARGET
+		x86_64) export RUST_TARGET="${ARCH}-unknown-linux-gnu" ;;
+		*)  die "unknown RUST_TARGET '${ARCH}'" ;;
+	esac
+
 	if [[ ${MULTILIB_VERBOSE} = true ]]
 	then
 		echo -e "${COLBLUE}*** ${COLGREEN}running with -${ABI} ABI${COLDEFAULT}"
@@ -175,7 +191,7 @@
 	fi
 	eval $@ || die
 
-	unset ABI CC CXX ABI_LIBDIR
+	unset ABI CC CXX ABI_LIBDIR RUST_TARGET
 	# keep pkgconfig clean
 	export PKG_CONFIG_PATH="${orig_pkg_config_path}"
 	export LDFLAGS="${saved_ldflags}"