[PATCH 1 of 2] scripts/build/gcc.sh: When compiling a Canadian Cross avoid using -print-multi-lib

[David Holsgrove <david dot holsgrove at xilinx dot com>]

# HG changeset patch
# User David Holsgrove <david.holsgrove@xilinx.com>
# Date 1348016639 -36000
# Node ID 95abeed3a485c4d5b02e4860fc554d6841e1cc41
# Parent  2858a24a584642e263a920b4214c815c172ed547
scripts/build/gcc.sh: When compiling a Canadian Cross avoid using -print-multi-lib

With a candian cross, attempting to ${CT_TARGET}-gcc -print-multi-lib will fail

As this is only for pretty log output, can safely sidestep

diff -r 2858a24a5846 -r 95abeed3a485 scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Sun Aug 12 07:45:42 2012 -0400
+++ b/scripts/build/cc/gcc.sh	Wed Sep 19 11:03:59 2012 +1000
@@ -460,7 +460,8 @@
     [ -z "${file}" ] || ext=".${file##*.}"
     CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${prefix}/bin/${CT_TARGET}-cc${ext}"
 
-    if [ "${CT_MULTILIB}" = "y" ]; then
+    # Skip for Canadian Build, can't run on the system and only gives pretty log output.
+    if [ "${CT_MULTILIB}" = "y" -a "${CT_CANADIAN}" != "y" ]; then
         multilibs=( $( "${prefix}/bin/${CT_TARGET}-gcc" -print-multi-lib   \
                        |tail -n +2 ) )
         if [ ${#multilibs[@]} -ne 0 ]; then
@@ -815,7 +816,8 @@
     [ -z "${file}" ] || ext=".${file##*.}"
     CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
 
-    if [ "${CT_MULTILIB}" = "y" ]; then
+    # Skip for Canadian Build, can't run on the system and only gives pretty log output.
+    if [ "${CT_MULTILIB}" = "y" -a "${CT_CANADIAN}" != "y" ]; then
         multilibs=( $( "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc" -print-multi-lib \
                        |tail -n +2 ) )
         if [ ${#multilibs[@]} -ne 0 ]; then

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