--- ../../../gentoo/dev-lang/rust/rust-1.50.0.ebuild	2021-02-12 00:09:21.000000000 -0000
+++ rust-1.50.0.ebuild	2021-03-07 15:47:24.399118769 -0000
@@ -95,6 +95,7 @@
 	system-llvm? (
 		${LLVM_DEPEND}
 	)
+	!system-bootstrap? ( dev-util/patchelf )
 "

 # we need to block older versions due to layout changes.
@@ -216,6 +217,25 @@

 		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
 			--destdir="${rust_stage0_root}" --prefix=/ || die
+
+		for i in $(find "${rust_stage0_root}/lib"); do
+				filetype=$(file $i)
+				if [[ $filetype == *ELF* ]]; then
+						echo "patching $i:"
+						patchelf --remove-rpath $i || die
+						echo " setting rpath= ${EPREFIX}/lib"
+						patchelf --force-rpath --set-rpath ${EPREFIX}/lib $i || die
+				fi
+		done
+
+		for i in $(find "${rust_stage0_root}/bin"); do
+				filetype=$(file $i)
+				if [[ $filetype == *ELF* ]]; then
+						echo "patching $i:"
+						echo " setting interpreter= ${EPREFIX}/lib64/ld-linux-x86-64.so.2"
+						patchelf --set-interpreter ${EPREFIX}/lib64/ld-linux-x86-64.so.2 $i || die
+				fi
+		done
 	fi

 	default