cc/gcc: do not print multilib for canadian-cross
author"Yann E. MORIN" <yann.morin.1998@free.fr>
Sat Oct 13 18:26:26 2012 +0200 (2012-10-13)
changeset 3074bcfcd68a4e0d
parent 3073 a6981147ccc0
child 3075 aadd4647dd91
cc/gcc: do not print multilib for canadian-cross

Previous import from patchwork missed one hunk (in cset #d8feb93b3e49)
Apply it now.

Signed-off-by: "David Holsgrove" <david.holsgrove@xilinx.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Patchwork-Id: 189053
scripts/build/cc/gcc.sh
     1.1 --- a/scripts/build/cc/gcc.sh	Thu Oct 04 15:59:31 2012 +1000
     1.2 +++ b/scripts/build/cc/gcc.sh	Sat Oct 13 18:26:26 2012 +0200
     1.3 @@ -821,17 +821,21 @@
     1.4      CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
     1.5  
     1.6      if [ "${CT_MULTILIB}" = "y" ]; then
     1.7 -        multilibs=( $( "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc" -print-multi-lib \
     1.8 -                       |tail -n +2 ) )
     1.9 -        if [ ${#multilibs[@]} -ne 0 ]; then
    1.10 -            CT_DoLog EXTRA "gcc configured with these multilibs (besides the default):"
    1.11 -            for i in "${multilibs[@]}"; do
    1.12 -                dir="${i%%;*}"
    1.13 -                flags="${i#*;}"
    1.14 -                CT_DoLog EXTRA "   ${flags//@/ -}  -->  ${dir}/"
    1.15 -            done
    1.16 +        if [ "${CT_CANADIAN}" = "y" ]; then
    1.17 +            CT_DoLog WARN "Canadian Cross unable to confirm multilibs configured correctly"
    1.18          else
    1.19 -            CT_DoLog WARN "gcc configured for multilib, but none available"
    1.20 +            multilibs=( $( "${prefix}/bin/${CT_TARGET}-gcc" -print-multi-lib \
    1.21 +                           |tail -n +2 ) )
    1.22 +            if [ ${#multilibs[@]} -ne 0 ]; then
    1.23 +                CT_DoLog EXTRA "gcc configured with these multilibs (besides the default):"
    1.24 +                for i in "${multilibs[@]}"; do
    1.25 +                    dir="${i%%;*}"
    1.26 +                    flags="${i#*;}"
    1.27 +                    CT_DoLog EXTRA "   ${flags//@/ -}  -->  ${dir}/"
    1.28 +                done
    1.29 +            else
    1.30 +                CT_DoLog WARN "gcc configured for multilib, but none available"
    1.31 +            fi
    1.32          fi
    1.33      fi
    1.34  }