# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1310918061 -7200
# Node ID dd71df95903afee50d58bebac8022392d3be0879
# Parent  6ee3b25e10976c01d9587090e4eaa59231733a37
cc/gcc: pass the companion libs prefix to cc_core

In case of canadian-cross, the companion libraries are not the same for
the core cc (they run on 'build') as they are for the final cc (they run
on 'host').

Prepare for this differentiation (coming later), while retaining the
current behavior (to use the same compblibs).

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

diff -r 6ee3b25e1097 -r dd71df95903a scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Sun Nov 20 18:08:00 2011 +0100
+++ b/scripts/build/cc/gcc.sh	Sun Jul 17 17:54:21 2011 +0200
@@ -67,12 +67,14 @@
         y,*,*)
             do_core=y
             core_opts+=( "mode=static" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             ;;
         ,y,*)
             ;;
         ,,nptl)
             do_core=y
             core_opts+=( "mode=static" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             ;;
         *)
             ;;
@@ -100,6 +102,7 @@
             core_opts+=( "mode=baremetal" )
             core_opts+=( "build_libgcc=yes" )
             core_opts+=( "build_libstdcxx=yes" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             if [ "${CT_STATIC_TOOLCHAIN}" = "y" ]; then
                 core_opts+=( "build_staticlinked=yes" )
             fi
@@ -110,15 +113,18 @@
             do_core=y
             core_opts+=( "mode=shared" )
             core_opts+=( "build_libgcc=yes" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             ;;
         ,,win32)
             do_core=y
             core_opts+=( "mode=static" )
             core_opts+=( "build_libgcc=yes" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             ;;
         *)
             do_core=y
             core_opts+=( "mode=static" )
+            core_opts+=( "complibs=${CT_COMPLIBS_DIR}" )
             if [ "${CT_CC_GCC_4_3_or_later}" = "y" ]; then
                 core_opts+=( "build_libgcc=yes" )
             fi
@@ -138,6 +144,7 @@
 #  - we need to build libgcc or not             : build_libgcc=[yes|no]       (default: no)
 #  - we need to build libstdc++ or not          : build_libstdcxx=[yes|no]    (default: no)
 #  - we need to build statically linked or not  : build_staticlinked=[yes|no] (default: no)
+#  - where to find the companion libs (prefix)  : complibs=<prefix_dir>       (no default value)
 # Usage: do_cc_core_backend mode=[static|shared|baremetal] build_libgcc=[yes|no] build_staticlinked=[yes|no]
 do_cc_core_backend() {
     local mode
@@ -146,6 +153,7 @@
     local build_staticlinked=no
     local build_manuals=no
     local core_prefix_dir
+    local complibs
     local lang_opt
     local tmp
     local -a host_libstdcxx_flags
@@ -249,26 +257,26 @@
     fi
 
     if [ "${CT_CC_GCC_USE_GMP_MPFR}" = "y" ]; then
-        extra_config+=("--with-gmp=${CT_COMPLIBS_DIR}")
-        extra_config+=("--with-mpfr=${CT_COMPLIBS_DIR}")
+        extra_config+=("--with-gmp=${complibs}")
+        extra_config+=("--with-mpfr=${complibs}")
     fi
     if [ "${CT_CC_GCC_USE_MPC}" = "y" ]; then
-        extra_config+=("--with-mpc=${CT_COMPLIBS_DIR}")
+        extra_config+=("--with-mpc=${complibs}")
     fi
     if [ "${CT_CC_GCC_USE_GRAPHITE}" = "y" ]; then
-        extra_config+=("--with-ppl=${CT_COMPLIBS_DIR}")
+        extra_config+=("--with-ppl=${complibs}")
         # With PPL 0.11+, also pull libpwl if needed
         if [ "${CT_PPL_NEEDS_LIBPWL}" = "y" ]; then
-            host_libstdcxx_flags+=("-L${CT_COMPLIBS_DIR}/lib")
+            host_libstdcxx_flags+=("-L${complibs}/lib")
             host_libstdcxx_flags+=("-lpwl")
         fi
-        extra_config+=("--with-cloog=${CT_COMPLIBS_DIR}")
+        extra_config+=("--with-cloog=${complibs}")
     elif [ "${CT_CC_GCC_HAS_GRAPHITE}" = "y" ]; then
         extra_config+=("--with-ppl=no")
         extra_config+=("--with-cloog=no")
     fi
     if [ "${CT_CC_GCC_USE_LTO}" = "y" ]; then
-        extra_config+=("--with-libelf=${CT_COMPLIBS_DIR}")
+        extra_config+=("--with-libelf=${complibs}")
         extra_config+=("--enable-lto")
     elif [ "${CT_CC_GCC_HAS_LTO}" = "y" ]; then
         extra_config+=("--with-libelf=no")