summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-30 01:23:44 (GMT)
committerAlexey Neyman <stilor@att.net>2017-03-30 01:50:09 (GMT)
commit6af04d822bdcd533ce731ba245f50bfbc22ed4a4 (patch)
tree34234390419758dd45d69b14733902363ff516b3 /scripts
parent2cdd503a68a47273ae3a059bebdb466f402c972f (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 'scripts')
-rw-r--r--scripts/crosstool-NG.sh.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 0b20fe3..68d6847 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