diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-30 01:23:44 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-03-30 01:50:09 (GMT) |
| commit | 6af04d822bdcd533ce731ba245f50bfbc22ed4a4 (patch) | |
| tree | 34234390419758dd45d69b14733902363ff516b3 /config | |
| parent | 2cdd503a68a47273ae3a059bebdb466f402c972f (diff) | |
cross-gdb: account for canadian/crossnative toolchains
... when determining if it can be linked statically, and if Python
scripting should default to y.
Prompted by a failure of i686-w64-mingw32,nios2-spico-elf sample
on a system where configure didn't report static linking support.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'config')
| -rw-r--r-- | config/cc/gcc.in.2 | 5 | ||||
| -rw-r--r-- | config/debug/gdb.in.cross | 8 | ||||
| -rw-r--r-- | config/toolchain.in | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index b4c5528..c147f05 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -66,8 +66,9 @@ config CC_GCC_STATIC_LIBSTDCXX bool prompt "Link libstdc++ statically into the gcc binary" default y - depends on CONFIGURE_has_static_link - select WANTS_STATIC_LINK + depends on CONFIGURE_has_static_link || CANADIAN || CROSS_NATIVE + select WANTS_STATIC_LINK if CROSS || NATIVE + select WANTS_STATIC_LINK_CXX if CROSS || NATIVE help Newer gcc versions require some c++ libraries. So statically linking libstdc++ increases the likeliness that the gcc binary will diff --git a/config/debug/gdb.in.cross b/config/debug/gdb.in.cross index 945f8eb..3053f71 100644 --- a/config/debug/gdb.in.cross +++ b/config/debug/gdb.in.cross @@ -17,8 +17,8 @@ if GDB_CROSS config GDB_CROSS_STATIC bool prompt "Build a static cross gdb" - depends on CONFIGURE_has_static_link - select WANTS_STATIC_LINK + depends on CONFIGURE_has_static_link || CROSS_NATIVE || CANADIAN + select WANTS_STATIC_LINK if NATIVE || CROSS help A static cross gdb can be useful if you debug on a machine that is not the one that is used to compile the toolchain. @@ -38,8 +38,8 @@ config GDB_CROSS_PYTHON bool prompt "Enable python scripting" depends on GDB_HAS_PYTHON - depends on ! GDB_CROSS_STATIC - default y + depends on !GDB_CROSS_STATIC + default y if !CROSS_NATIVE && !CANADIAN help Say 'y' if you want to use Python scripting inside gdb. Say 'n' if you do not want to. diff --git a/config/toolchain.in b/config/toolchain.in index 9d3ad18..c712f39 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -47,14 +47,18 @@ config SYSROOT_DIR_PREFIX In fact, the sysroot path is constructed as: ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME} +# FIXME: the name is misleading, it is only checking if we want the build machine +# to support static linking. config WANTS_STATIC_LINK bool +config WANTS_STATIC_LINK_CXX + bool config STATIC_TOOLCHAIN bool prompt "Build Static Toolchain" depends on CONFIGURE_has_static_link - select WANTS_STATIC_LINK + select WANTS_STATIC_LINK if NATIVE || CROSS help Build static host binaries. |