From 1339801661fb6ef50d36f50bed81b29d18a75da3 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Thu, 17 Feb 2011 21:54:07 +0100
Subject: internals: fix stripping host binaries

The gcc used by linaro has a version number specific to Linaro, but
identifies itself with its upstream version numbering scheme.

This breaks the strip in the finish step, because the actual gcc version
is not the same as the configured one (eg. 4.5.2 vs. linaro-4.5-2011.02-0).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index a0749a6..cf129d9 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -7,6 +7,7 @@ do_finish() {
     local _t
     local _type
     local strip_args
+    local gcc_version
 
     CT_DoStep INFO "Cleaning-up the toolchain's directory"
 
@@ -21,10 +22,11 @@ do_finish() {
         esac
         CT_DoLog INFO "Stripping all toolchain executables"
         CT_Pushd "${CT_PREFIX_DIR}"
-        for _t in "bin/${CT_TARGET}-"*                                          \
-                  "${CT_TARGET}/bin/"*                                          \
-                  "libexec/gcc/${CT_TARGET}/${CT_CC_VERSION}/"*                 \
-                  "libexec/gcc/${CT_TARGET}/${CT_CC_VERSION}/install-tools/"*   \
+        gcc_version=$( "./bin/${CT_TARGET}-gcc" -dumpversion )
+        for _t in "bin/${CT_TARGET}-"*                                      \
+                  "${CT_TARGET}/bin/"*                                      \
+                  "libexec/gcc/${CT_TARGET}/${gcc_version}/"*               \
+                  "libexec/gcc/${CT_TARGET}/${gcc_version}/install-tools/"* \
         ; do
             _type="$( file "${_t}" |cut -d ' ' -f 2- )"
             case "${_type}" in
-- 
cgit v0.10.2-6-g49f6