--- /usr/portage/dev-lang/rust/rust-1.15.1.ebuild	2017-02-10 00:18:28.000000000 +0100
+++ /usr/local/portage/dev-lang/rust/rust-1.15.1.ebuild	2017-02-23 11:34:25.754066876 +0100
@@ -6,7 +6,7 @@
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit python-any-r1 versionator toolchain-funcs
+inherit python-any-r1 versionator toolchain-funcs rust-toolchain
 
 if [[ ${PV} = *beta* ]]; then
 	betaver=${PV//*beta}
@@ -25,20 +25,18 @@
 
 CARGO_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
 STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rustc-${STAGE0_VERSION}-x86_64-unknown-linux-gnu"
-RUST_STAGE0_x86="rustc-${STAGE0_VERSION}-i686-unknown-linux-gnu"
+RUST_STAGE0="rustc-${STAGE0_VERSION}"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 
 SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.gz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.gz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.gz )
+	 $(rust_all_arch_uris https://static.rust-lang.org/dist/${RUST_STAGE0})
 "
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
-IUSE="clang debug doc libcxx +system-llvm"
+IUSE="clang debug doc libcxx multilib +system-llvm"
 REQUIRED_USE="libcxx? ( clang )"
 
 RDEPEND="libcxx? ( sys-libs/libcxx )
@@ -67,13 +65,13 @@
 src_configure() {
 	export CFG_DISABLE_LDCONFIG="notempty"
 
-	local stagename="RUST_STAGE0_${ARCH}"
-	local stage0="${!stagename}"
-
 	"${ECONF_SOURCE:-.}"/configure \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)/${P}" \
 		--mandir="${EPREFIX}/usr/share/${P}/man" \
+		--host=$(rust_abi) \
+		--build=$(rust_abi) \
+		--target=$(rust_all_abis) \
 		--release-channel=${SLOT%%/*} \
 		--disable-manage-submodules \
 		--disable-rustbuild \
@@ -82,7 +80,7 @@
 		--python=${EPYTHON} \
 		--disable-rpath \
 		--enable-local-rust \
-		--local-rust-root="${WORKDIR}/${stage0}/rustc" \
+		--local-rust-root="${WORKDIR}/${RUST_STAGE0}-$(rust_abi)/rustc" \
 		$(use_enable clang) \
 		$(use_enable debug) \
 		$(use_enable debug llvm-assertions) \