From 6af04d822bdcd533ce731ba245f50bfbc22ed4a4 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 29 Mar 2017 18:23:44 -0700 Subject: 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 --- scripts/crosstool-NG.sh.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3