diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2014-12-10 19:44:35 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2014-12-10 19:44:35 (GMT) |
| commit | 7275900f9ffce61fabc90e0ff870fec175976ffb (patch) | |
| tree | aa1a49a4878dfa3d3c4a4f55348aa39589dc49a7 | |
| parent | 0a962fc7ecca10468a245f1d93eaa473b3ea1543 (diff) | |
| parent | 9159846334ce9a8e2f2e96c5407cea4ed4f2db6d (diff) | |
Merge pull request #9 from bhundven/master
Fixes for glibc and gdb
| -rw-r--r-- | config/libc/glibc-eglibc.in-common | 2 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common index 6c5d2f0..f199e3a 100644 --- a/config/libc/glibc-eglibc.in-common +++ b/config/libc/glibc-eglibc.in-common @@ -14,6 +14,7 @@ config LIBC_GLIBC_MAY_FORCE_PORTS default y if ARCH_arm default y if ARCH_mips select LIBC_GLIBC_USE_PORTS + depends on !LIBC_GLIBC_2_20_or_later # Force using the BFD linker during the toolchain build config LIBC_glibc_familly @@ -121,6 +122,7 @@ config LIBC_GLIBC_FORCE_UNWIND config LIBC_GLIBC_USE_PORTS bool prompt "Use the ports addon" + depends on !LIBC_GLIBC_2_20_or_later help The ports addon contains some architecture ports that are not available in the official distribution. diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index dea5eae..149a2f8 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -51,7 +51,7 @@ do_debug_gdb_get() { if [ "${CT_GDB_CUSTOM}" = "y" ]; then CT_GetCustom "gdb" "${CT_GDB_VERSION}" "${CT_GDB_CUSTOM_LOCATION}" else - if [ x"${linaro_release}" = x"${CT_GDB_VERSION}" ]; then + if [ x"${linaro_version}" = x"${CT_GDB_VERSION}" ]; then CT_GetFile "gdb-${CT_GDB_VERSION}" \ ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \ {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb |