--- a/llvm-3.5.0-r99.ebuild	2015-03-03 17:18:16.906890613 +0000
+++ a/llvm-3.5.0-r99.ebuild	2015-03-03 17:17:59.479889539 +0000
@@ -149,12 +149,13 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-3.5-musl-fixes.patch
 	epatch "${FILESDIR}"/${PN}-3.5-musl-support.patch
-	epatch "${FILESDIR}"/${PN}-3.5-musl-compiler-rt.patch
 
 	epatch "${FILESDIR}"/${P}-fix_LLVMExports_cmake.patch
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
+		epatch "${FILESDIR}"/${PN}-3.5-musl-compiler-rt.patch
+		epatch "${FILESDIR}"/${PN}-3.5-musl-clang-support.patch
 		epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
 
 		epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch