[PATCH 2 of 3] config/cc: CC_STATIC_LIBSTDCXX depends on CONFIGURE_has_static_libstdcpp

[Bryan Hundven <bryanhundven at gmail dot com>]

 config/cc/gcc.in.2      |  2 +-
 scripts/build/cc/gcc.sh |  4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


# HG changeset patch
# User Bryan Hundven <bryanhundven@gmail.com>
# Date 1306731508 25200
# Node ID 9d58c4e241bebc95f78ad593222a94ed364d39e9
# Parent  e48d80f0eb9ea97c2d12f7239a7c54858fb0126a
config/cc: CC_STATIC_LIBSTDCXX depends on CONFIGURE_has_static_libstdcpp

The CC_STATIC_LIBSTDCXX option should depend on libstdc++ being phyiscally
on the build host. If CONFIGURE_has_static_libstdcpp, introduced in the
previous commit, is disabled CC_STATIC_LIBSTDCXX will also be disabled.
STATIC_TOOLCHAIN selects CC_STATIC_LIBSTDCXX, so nothing to do for static
toolchain support.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff -r e48d80f0eb9e -r 9d58c4e241be config/cc/gcc.in.2
--- a/config/cc/gcc.in.2	Sun May 29 21:58:08 2011 -0700
+++ b/config/cc/gcc.in.2	Sun May 29 21:58:28 2011 -0700
@@ -64,7 +64,7 @@
     bool
     prompt "Link libstdc++ statically into the gcc binary"
     default y
-    depends on CC_GCC_4_4_or_later
+    depends on CC_GCC_4_4_or_later && CONFIGURE_has_static_libstdcpp
     help
       Newer gcc versions use the PPL library which is C++ code.  Statically
       linking libstdc++ increases the likeliness that the gcc binary will
diff -r e48d80f0eb9e -r 9d58c4e241be scripts/build/cc/gcc.sh
--- a/scripts/build/cc/gcc.sh	Sun May 29 21:58:08 2011 -0700
+++ b/scripts/build/cc/gcc.sh	Sun May 29 21:58:28 2011 -0700
@@ -197,7 +197,7 @@
         core_LDFLAGS+=("-lstdc++")
         core_LDFLAGS+=("-lm")
     else
-        if [ "${CT_CC_STATIC_LIBSTDCXX}" = "y" ]; then
+        if [ "${CT_CC_STATIC_LIBSTDCXX}" = "y" -a "${CONFIGURE_has_static_libstdcpp}" = "y" ]; then
             # this is from CodeSourcery arm-2010q1-202-arm-none-linux-gnueabi.src.tar.bz2
             # build script
             # FIXME: if the host gcc is gcc-4.5 then presumably we could use -static-libstdc++,
@@ -448,7 +448,7 @@
         final_LDFLAGS+=("-lstdc++")
         final_LDFLAGS+=("-lm")
     else
-        if [ "${CT_CC_STATIC_LIBSTDCXX}" = "y" ]; then
+        if [ "${CT_CC_STATIC_LIBSTDCXX}" = "y" -a "${CONFIGURE_has_static_libstdcpp}" = "y" ]; then
             # this is from CodeSourcery arm-2010q1-202-arm-none-linux-gnueabi.src.tar.bz2
             # build script
             # FIXME: if the host gcc is gcc-4.5 then presumably we could use -static-libstdc++,

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