diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc
index 3c94492..201b1d0 100644
--- a/recipes-devtools/rust/rust-llvm.inc
+++ b/recipes-devtools/rust/rust-llvm.inc
@@ -33,11 +33,11 @@ do_install_append () {
 	# Remove the debug info (>2 GB) as part of normal operation
 	rm -rf ${D}${bindir}/.debug
 
-	cd ${D}${bindir}
-	ln -s *-llc llc
-	for i in *-llvm-*; do
-		link=$(echo $i | sed -e 's/.*-llvm-\(.*\)/\1/')
-		ln -sf $i llvm-$link
+	cd ${D}${bindir} || bbfatal "failed to cd ${D}${bindir}"
+	for i in *-llvm-* *-llc *-lli *-FileCheck; do
+		link=$(echo $i | sed -e "s/${TARGET_SYS}-\(.*\)/\1/")
+		[ -e "${i}" ] || bbfatal "no such file to symlink to ${i}"
+		ln -sf "$i" "${link}" || bbfatal "failed to symlink ${link} to ${i}"
 	done
 }
 
diff --git a/recipes-devtools/rust/rust-llvm_1.10.0.bb b/recipes-devtools/rust/rust-llvm_1.10.0.bb
index 36a8212..6405153 100644
--- a/recipes-devtools/rust/rust-llvm_1.10.0.bb
+++ b/recipes-devtools/rust/rust-llvm_1.10.0.bb
@@ -2,9 +2,3 @@ require rust-llvm.inc
 
 SRC_URI[rust.md5sum] = "a48fef30353fc9daa70b484b690ce5db"
 SRC_URI[rust.sha256sum] = "a4015aacf4f6d8a8239253c4da46e7abaa8584f8214d1828d2ff0a8f56176869"
-
-do_install_append () {
-	cd "${B}"
-	install -d "${D}${bindir}"
-	install -m755 "Release/bin/FileCheck" "${D}${bindir}"
-}