From 43aa07a88a2fc25c070a2ea8406c3463eef4b5b1 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Mon, 4 Apr 2016 16:28:50 -0500
Subject: [PATCH] rust-llvm: combine do_install_append()

There were two different do_install_append()'s and they didn't check for
errors so this improves that situation.
---
 recipes-devtools/rust/rust-llvm.bb  | 6 ------
 recipes-devtools/rust/rust-llvm.inc | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/recipes-devtools/rust/rust-llvm.bb b/recipes-devtools/rust/rust-llvm.bb
index 62fb3d4..7be3238 100644
--- a/recipes-devtools/rust/rust-llvm.bb
+++ b/recipes-devtools/rust/rust-llvm.bb
@@ -1,9 +1,3 @@
 require rust-llvm.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=4c0bc17c954e99fd547528d938832bfa"
-
-do_install_append () {
-	cd "${B}"
-	install -d "${D}${bindir}"
-	install -m755 "Release/bin/FileCheck" "${D}${bindir}"
-}
diff --git a/recipes-devtools/rust/rust-llvm.inc b/recipes-devtools/rust/rust-llvm.inc
index 1b51c72..897f4f9 100644
--- a/recipes-devtools/rust/rust-llvm.inc
+++ b/recipes-devtools/rust/rust-llvm.inc
@@ -27,11 +27,11 @@ do_install_append () {
 	# Remove the debug info (>2 GB) as part of normal operation
 	rm -rf ${D}${bindir}/.debug
 
-	cd ${D}${bindir}
+	cd ${D}${bindir} || bbfatal "failed to 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
+	for i in *-llvm-* *-llc *-lli *-FileCheck; do
+		link=$(echo $i | sed -e "s/${TARGET_SYS}-\(.*\)/\1/")
+		ln -sf "$i" "${link}" || bbfatal "failed to symlink ${link}"
 	done
 }