From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Mon, 27 May 2019 00:12:30 +0000 (-0700)
Subject: dev-lang/rust: fix codegen-backends location on x86 for 1.35.0
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=564f0da7e6758a828264dfb061cf4980335e42e9;p=gentoo.git

dev-lang/rust: fix codegen-backends location on x86 for 1.35.0

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
---

diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
index 42008af25b58..29bf1ddae801 100644
--- a/dev-lang/rust/rust-1.35.0.ebuild
+++ b/dev-lang/rust/rust-1.35.0.ebuild
@@ -274,6 +274,18 @@ src_install() {
 		   "${ED}/usr/${abi_libdir}" || die
 	done
 
+		# temp fix for https://bugs.gentoo.org/672816
+	if use x86; then
+		local rust_target wrongdir rightdir
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
+		rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
+		if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
+			mv "${wrongdir}" "${rightdir}" || die
+			rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
+		fi
+	fi # end temp fix
+
 	dodoc COPYRIGHT
 
 	# FIXME: