Merge pull request #12 from starlab-io/duplication

De-duplication

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}"
-}

recipes-devtools/rust/rust-llvm.inc

@@ -15,11 +15,7 @@ EXTRA_OECONF += "--enable-bindings=none"
 EXTRA_OECONF += "--disable-terminfo"
 EXTRA_OECONF += "--disable-zlib"
 EXTRA_OECONF += "--disable-libffi"
-
 EXTRA_OECONF += "--enable-keep-symbols"
-EXTRA_OECONF += "--disable-terminfo"
-EXTRA_OECONF += "--disable-zlib"
-EXTRA_OECONF += "--disable-libffi"
 
 PACKAGES += "${PN}-data"
 
@@ -31,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
 }