cross,sdk,cross-canadian: Create symlinks for llvm-ar llvm-ranlib llvm-nm

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 19 insertions, 33 deletions

diff --git a/recipes-devtools/clang/clang-cross-canadian_git.bb b/recipes-devtools/clang/clang-cross-canadian_git.bb
index cb2a355..e93e8a4 100644
--- a/recipes-devtools/clang/clang-cross-canadian_git.bb
+++ b/recipes-devtools/clang/clang-cross-canadian_git.bb
@@ -20,16 +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 ../clang-tidy ${D}${bindir}/${TARGET_PREFIX}clang-tidy
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
-        if [ -e ${D}${bindir}/lld ]; then
-            ln -sf ../lld ${D}${bindir}/${TARGET_PREFIX}lld
-            ln -sf ../ld.lld ${D}${bindir}/${TARGET_PREFIX}ld.lld
-        fi
+        install -d ${D}${bindir}
+        for tool in clang clang++ clang-tidy lld ld.lld 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 *-lld *-ld.lld"
+do_install_append() {
         cross_canadian_bindirlinks
 }
-
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-clang-tidy *-lld *-ld.lld"
diff --git a/recipes-devtools/clang/clang-cross_git.bb b/recipes-devtools/clang/clang-cross_git.bb
index 01bdfd8..ffe144a 100644
--- a/recipes-devtools/clang/clang-cross_git.bb
+++ b/recipes-devtools/clang/clang-cross_git.bb
@@ -16,25 +16,17 @@ 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 ../clang-tidy ${D}${bindir}/${TARGET_PREFIX}clang-tidy
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
-        for tool in llvm-ar llvm-ranlib llvm-nm
+        for tool in clang clang++ clang-tidy lld ld.lld llvm-profdata llvm-ar llvm-ranlib llvm-nm
         do
                 ln -sf ../$tool ${D}${bindir}/${TARGET_PREFIX}$tool
         done
-        if [ -e ${D}${bindir}/lld ]; then
-            ln -sf ../lld ${D}${bindir}/${TARGET_PREFIX}lld
-            ln -sf ../ld.lld ${D}${bindir}/${TARGET_PREFIX}ld.lld
-        fi
 }
+SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
+                      *-llvm-ranlib *-llvm-nm *-lld *-ld.lld"
 
 SYSROOT_PREPROCESS_FUNCS += "clangcross_sysroot_preprocess"
 
 clangcross_sysroot_preprocess () {
         sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
 }
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-llvm-ar \
-                      *-llvm-ranlib *-llvm-nm *-lld *-ld.lld"
 PACKAGES = ""
diff --git a/recipes-devtools/clang/clang-crosssdk_git.bb b/recipes-devtools/clang/clang-crosssdk_git.bb
index 9e21d80..8f07a83 100644
--- a/recipes-devtools/clang/clang-crosssdk_git.bb
+++ b/recipes-devtools/clang/clang-crosssdk_git.bb
@@ -15,21 +15,17 @@ 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 ../clang-tidy ${D}${bindir}/${TARGET_PREFIX}clang-tidy
-        ln -sf ../llvm-profdata ${D}${bindir}/${TARGET_PREFIX}llvm-profdata
-        if [ -e ${D}${bindir}/lld ]; then
-            ln -sf ../lld ${D}${bindir}/${TARGET_PREFIX}lld
-            ln -sf ../ld.lld ${D}${bindir}/${TARGET_PREFIX}ld.lld
-        fi
+        install -d ${D}${bindir}
+        for tool in clang clang++ clang-tidy lld ld.lld 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 *-lld *-ld.lld"
 sysroot_stage_all () {
         sysroot_stage_dir ${D}${bindir} ${SYSROOT_DESTDIR}${bindir}
 }
 
-SSTATE_SCAN_FILES += "*-clang *-clang++ *-llvm-profdata *-clang-tidy *-lld *-ld.lld"
 PACKAGES = ""