3 files changed, 17 insertions, 16 deletions

diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb
index b547f47..69a7e1f 100644
--- a/recipes-devtools/clang/clang-cross-canadian_git.bb
+++ b/recipes-devtools/clang/clang-cross-canadian_git.bb
@@ -20,11 +20,14 @@ EXTRA_OECONF_PATHS[vardepsexclude] = "TUNE_PKGARCH"
 TARGET_ARCH[vardepsexclude] = "TUNE_ARCH"
 
 do_install() {
-        install -d  ${D}${bindir}
-        ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
-        ln -sf ../clang++ ${D}${bindir}/${TARGET_PREFIX}clang++
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
+        install -d ${D}${bindir}
+        for tool in clang clang++ llvm-profdata llvm-ar llvm-ranlib llvm-nm
+        do
+                ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
+        done
+}
+SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
+                      *-llvm-ranlib *-llvm-nm"
+do_install_append() {
         cross_canadian_bindirlinks
 }
-
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata"
diff --git a/recipes-devtools/clang/clang-cross_git.bb b/recipes-devtools/clang/clang-cross_git.bb
index 618aa5d..22f177f 100644
--- a/recipes-devtools/clang/clang-cross_git.bb
+++ b/recipes-devtools/clang/clang-cross_git.bb
@@ -16,10 +16,7 @@ DEPENDS += "clang-native binutils-cross-${TARGET_ARCH}"
 
 do_install() {
         install -d ${D}${bindir}
-        ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
-        ln -sf ../clang++ ${D}${bindir}/${TARGET_PREFIX}clang++
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
-        for tool in llvm-ar llvm-ranlib llvm-nm
+        for tool in clang clang++ llvm-profdata llvm-ar llvm-ranlib llvm-nm
         do
                 ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
         done
diff --git a/recipes-devtools/clang/clang-crosssdk_git.bb b/recipes-devtools/clang/clang-crosssdk_git.bb
index 0fd80be..ac1dd63 100644
--- a/recipes-devtools/clang/clang-crosssdk_git.bb
+++ b/recipes-devtools/clang/clang-crosssdk_git.bb
@@ -15,15 +15,16 @@ inherit crosssdk
 DEPENDS += "clang-native nativesdk-clang-glue virtual/${TARGET_PREFIX}binutils-crosssdk virtual/nativesdk-libc"
 
 do_install() {
-        install -d  ${D}${bindir}
-        ln -sf ../clang ${D}${bindir}/${TARGET_PREFIX}clang
-        ln -sf ../clang++ ${D}${bindir}/${TARGET_PREFIX}clang++
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
+        install -d ${D}${bindir}
+        for tool in clang clang++ llvm-profdata llvm-ar llvm-ranlib llvm-nm
+        do
+                ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
+        done
 }
-
+SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
+                      *-llvm-ranlib *-llvm-nm"
 sysroot_stage_all () {
         sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
 }
 
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata"
 PACKAGES = ""