From 08ebd6ec3db26f34ea4fcb04fc475aec5e26ad73 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Thu, 2 Jun 2011 19:50:12 +0200 Subject: cc/gcc: CC_STATIC_LIBSTDCXX 'depends on' CONFIGURE_has_static_libstdcpp Hide the staticaly linked libstdc++ option if the static libstdc++ is not present, detected at configure time. Add a blind option that says whether static linking is possible at all. It defaults to 'y', but depends on the needed CONFIGURE_* options. For now, it only depends on static libtdc++, but new dependencies can be easily added. Hide the global static toolchain option behind this new option. Original patch by Bryan Hundven Signed-off-by: "Yann E. MORIN" --- config/cc/gcc.in.2 | 1 + config/toolchain.in | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'config') diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index bf333738..c8d991aa 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -44,6 +44,7 @@ config CC_STATIC_LIBSTDCXX bool prompt "Link libstdc++ statically into the gcc binary" default y + depends on CONFIGURE_has_static_libstdcxx depends on CC_GCC_4_4_or_later help Newer gcc versions use the PPL library which is C++ code. Statically diff --git a/config/toolchain.in b/config/toolchain.in index d5ee6b7c..bc8f19c1 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -46,10 +46,19 @@ config SYSROOT_DIR_PREFIX In fact, the sysroot path is constructed as: ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME} +# In case we need to add more conditions to enable static +# toolchain, we'll be adding them here +config STATIC_TOOLCHAIN_POSSIBLE + bool + default y + depends on CONFIGURE_has_static_libstdcxx + # Add new deps here! :-) + config STATIC_TOOLCHAIN bool prompt "Build Static Toolchain (EXPERIMENTAL)" depends on EXPERIMENTAL + depends on STATIC_TOOLCHAIN_POSSIBLE help Build static host binaries. -- cgit v1.2.3