From 6af04d822bdcd533ce731ba245f50bfbc22ed4a4 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 29 Mar 2017 18:23:44 -0700
Subject: [PATCH] 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>
---
 config/cc/gcc.in.2         |  5 +++--
 config/debug/gdb.in.cross  |  8 ++++----
 config/toolchain.in        |  6 +++++-
 scripts/crosstool-NG.sh.in | 10 +++++-----
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
index b4c55283..c147f05e 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 945f8eb7..3053f713 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 9d3ad18d..c712f395 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.
       
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 0b20fe33..68d68477 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -563,18 +563,18 @@ if [ -z "${CT_RESTART}" ]; then
     rm -f "${gccout}"
     CT_EndStep
 
+    # These tests are only enabled if we need static linking on the *build*
     if [ "${CT_WANTS_STATIC_LINK}" = "y" ]; then
         CT_DoStep DEBUG "Checking that gcc can compile a trivial statically linked program (CT_WANTS_STATIC_LINK)"
         CT_DoLog DEBUG "You may need to ensure that static libraries such as libc.a are installed on your system"
-        CT_DoExecLog DEBUG "${CT_HOST}-gcc" ${CT_CFLAGS_FOR_HOST} ${CT_LDFLAGS_FOR_HOST} "${testc}" -static -o "${gccout}"
+        CT_DoExecLog DEBUG "${CT_HOST}-gcc" ${CT_CFLAGS_FOR_BUILD} ${CT_LDFLAGS_FOR_BUILD} "${testc}" -static -o "${gccout}"
         rm -f "${gccout}"
         CT_EndStep
     fi
-
-    if [ "${CT_CC_GCC_STATIC_LIBSTDCXX}" = "y" ]; then
-        CT_DoStep DEBUG "Checking that gcc can statically link libstdc++ (CT_CC_GCC_STATIC_LIBSTDCXX)"
+    if [ "${CT_WANTS_STATIC_LINK_CXX}" = "y" ]; then
+        CT_DoStep DEBUG "Checking that gcc can statically link libstdc++ (CT_WANTS_STATIC_LINK_CXX)"
         CT_DoLog DEBUG "You may need to ensure that libstdc++.a is installed on your system"
-        CT_DoExecLog DEBUG "${CT_HOST}-gcc" ${CT_CFLAGS_FOR_HOST} ${CT_LDFLAGS_FOR_HOST} "${testc}" -static -lstdc++ -o "${gccout}"
+        CT_DoExecLog DEBUG "${CT_HOST}-gcc" ${CT_CFLAGS_FOR_BUILD} ${CT_LDFLAGS_FOR_BUILD} "${testc}" -static -lstdc++ -o "${gccout}"
         rm -f "${gccout}"
         CT_EndStep
     fi