--- toolchain.eclass.old	2016-05-08 21:15:23.000000000 -0500
+++ toolchain.eclass	2016-05-09 20:00:46.060287860 -0500
@@ -1789,7 +1789,7 @@
 	# code to run on the target.
 	if tc_version_is_at_least 5 && is_crosscompile ; then
 		dodir "${HOSTLIBPATH}"
-		mv "${D}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die
+		mv "${D}"/usr/lib*/libcc1* "${D}${HOSTLIBPATH}" || die
 	fi
 
 	# For all the libs that are built for CTARGET, move them into the