diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-30 06:13:08 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-03-30 06:13:08 (GMT) |
| commit | a7edff1820d89b45449c7764644fbfa3562e3297 (patch) | |
| tree | eee13dd4cd1ce0ba5215d1d6cfa6967e9fc3b22b /scripts | |
| parent | 54a4975220e6a277e93f7844bb79c2dbf5554d16 (diff) | |
| parent | 6af04d822bdcd533ce731ba245f50bfbc22ed4a4 (diff) | |
Merge pull request #667 from stilor/cross-gdb-deps
cross-gdb: account for canadian/crossnative toolchains
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 10 |
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 |