[CT-NG:patch 02/19] Symlink to cc not always installed correctly

[Remy Bohmer <linux at bohmer dot net>]

When building an cross-compiler for a host which depends
on file extensions the symlink for cc was not installed correctly

Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com>
---
 scripts/build/cc/gcc.sh |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

Index: crosstool-ng/scripts/build/cc/gcc.sh
===================================================================
--- crosstool-ng.orig/scripts/build/cc/gcc.sh
+++ crosstool-ng/scripts/build/cc/gcc.sh
@@ -246,7 +246,14 @@ do_cc_core() {
 
     # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
     # to call the C compiler with the same, somewhat canonical name.
-    CT_DoExecLog ALL ln -sv "${CT_TARGET}"-gcc "${core_prefix_dir}/bin/${CT_TARGET}"-cc
+    # check whether compiler as an extension
+    file=$(ls -1 ${core_prefix_dir}/bin/${CT_TARGET}-gcc.* 2>/dev/null || echo "")
+    if [ "x${file}" = "x" ]; then
+        CT_DoExecLog ALL ln -sv "${CT_TARGET}"-gcc "${core_prefix_dir}/bin/${CT_TARGET}"-cc
+    else
+        ext=${file##*.}
+        CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc.${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc.${ext}"
+    fi
 
     CT_EndStep
 }
@@ -362,7 +369,14 @@ do_cc() {
 
     # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able
     # to call the C compiler with the same, somewhat canonical name.
-    CT_DoExecLog ALL ln -sv "${CT_TARGET}"-gcc "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-cc
+    # check whether compiler as an extension
+    file=$(ls -1 ${CT_TARGET}/bin/${CT_TARGET}-gcc.* 2>/dev/null || echo "")
+    if [ "x${file}" = "x" ]; then
+        CT_DoExecLog ALL ln -sv "${CT_TARGET}"-gcc "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-cc
+    else
+        ext=${file##*.}
+        CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc.${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc.${ext}"
+    fi
 
     CT_EndStep
 }

-- 


--
For unsubscribe information see http://sourceware.org/lists.html#faq