summaryrefslogtreecommitdiff
path: root/scripts/build/cc
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@free.fr>2012-10-13 16:26:26 (GMT)
committerYann E. MORIN" <yann.morin.1998@free.fr>2012-10-13 16:26:26 (GMT)
commitdad17e6e88ba54c89e9714f35aa72b400ebd9ea5 (patch)
tree61586eb2dd01df47346080f8d9f5697e5049b109 /scripts/build/cc
parent071606c0a072dfcaa168a1435dd09fe499ce2e7b (diff)
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
Diffstat (limited to 'scripts/build/cc')
-rw-r--r--scripts/build/cc/gcc.sh24
1 files changed, 14 insertions, 10 deletions
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 5553a8a..dce77e9 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -821,17 +821,21 @@ do_cc_backend() {
CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
if [ "${CT_MULTILIB}" = "y" ]; then
- multilibs=( $( "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc" -print-multi-lib \
- |tail -n +2 ) )
- if [ ${#multilibs[@]} -ne 0 ]; then
- CT_DoLog EXTRA "gcc configured with these multilibs (besides the default):"
- for i in "${multilibs[@]}"; do
- dir="${i%%;*}"
- flags="${i#*;}"
- CT_DoLog EXTRA " ${flags//@/ -} --> ${dir}/"
- done
+ if [ "${CT_CANADIAN}" = "y" ]; then
+ CT_DoLog WARN "Canadian Cross unable to confirm multilibs configured correctly"
else
- CT_DoLog WARN "gcc configured for multilib, but none available"
+ multilibs=( $( "${prefix}/bin/${CT_TARGET}-gcc" -print-multi-lib \
+ |tail -n +2 ) )
+ if [ ${#multilibs[@]} -ne 0 ]; then
+ CT_DoLog EXTRA "gcc configured with these multilibs (besides the default):"
+ for i in "${multilibs[@]}"; do
+ dir="${i%%;*}"
+ flags="${i#*;}"
+ CT_DoLog EXTRA " ${flags//@/ -} --> ${dir}/"
+ done
+ else
+ CT_DoLog WARN "gcc configured for multilib, but none available"
+ fi
fi
fi
}