diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | config/cc/gcc.in | 8 | ||||
| -rw-r--r-- | config/libc/glibc-eglibc.in-common | 2 | ||||
| -rw-r--r-- | docs/.gitignore | 1 | ||||
| -rw-r--r-- | scripts/build/cc/gcc.sh | 9 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 8 |
6 files changed, 18 insertions, 13 deletions
@@ -3,11 +3,12 @@ configure autom4te.cache config.log config.status -Makefile +/Makefile *ct-ng* !ct-ng.comp !ct-ng.in paths.* +!paths.in config.gen/ .config .config.2 diff --git a/config/cc/gcc.in b/config/cc/gcc.in index bd8bcb3..5c2d98f 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -53,7 +53,7 @@ config CC_V_4_9_0 config CC_V_linaro_4_8 bool - prompt "linaro-4.8-2014.01" + prompt "linaro-4.8-2014.04" depends on CC_GCC_SHOW_LINARO select CC_GCC_4_8 @@ -79,7 +79,7 @@ config CC_V_4_8_0 config CC_V_linaro_4_7 bool - prompt "linaro-4.7-2014.01" + prompt "linaro-4.7-2014.06" depends on CC_GCC_SHOW_LINARO select CC_GCC_4_7 @@ -500,12 +500,12 @@ config CC_VERSION default "4.9.2" if CC_V_4_9_2 default "4.9.1" if CC_V_4_9_1 default "4.9.0" if CC_V_4_9_0 - default "linaro-4.8-2014.01" if CC_V_linaro_4_8 + default "linaro-4.8-2014.04" if CC_V_linaro_4_8 default "4.8.3" if CC_V_4_8_3 default "4.8.2" if CC_V_4_8_2 default "4.8.1" if CC_V_4_8_1 default "4.8.0" if CC_V_4_8_0 - default "linaro-4.7-2014.01" if CC_V_linaro_4_7 + default "linaro-4.7-2014.06" if CC_V_linaro_4_7 default "4.7.4" if CC_V_4_7_4 default "4.7.3" if CC_V_4_7_3 default "4.7.2" if CC_V_4_7_2 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/docs/.gitignore b/docs/.gitignore index 53f6ef9..fc05ff2 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,2 +1,3 @@ *ct-ng*.1 *ct-ng*.1.gz +!ct-ng.1.in diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index ff82421..632bc8c 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -4,8 +4,8 @@ # Download gcc do_cc_get() { - local linaro_version - local linaro_series + local linaro_version="" + local linaro_series="" local linaro_base_url="http://launchpad.net/gcc-linaro" if [ "${CT_CC_CUSTOM}" = "y" ]; then @@ -22,10 +22,11 @@ do_cc_get() { # The official gcc hosts put gcc under a gcc/release/ directory, # whereas the mirrors put it in the gcc/ directory. # Also, Split out linaro mirrors, so that downloads happen faster. - if [ x"${linaro_version}" = x"" ]; then + CT_DoLog EXTRA "linaro_version: ${linaro_version} CT_CC_VERSION: ${CT_CC_VERSION}" + if [ x"${linaro_version}" = x"${CT_CC_VERSION}" ]; then CT_GetFile "gcc-${CT_CC_VERSION}" \ ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION} \ - {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION} \ + {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION} else CT_GetFile "gcc-${CT_CC_VERSION}" \ "${linaro_base_url}/${linaro_series}/${linaro_version}/+download" diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 0c63724..149a2f8 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -33,8 +33,8 @@ do_debug_gdb_parts() { } do_debug_gdb_get() { - local linaro_version - local linaro_series + local linaro_version="" + local linaro_series="" local linaro_base_url="http://launchpad.net/gdb-linaro" # Account for the Linaro versioning @@ -51,10 +51,10 @@ 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"" ]; 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 \ + {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb else CT_GetFile "gdb-${CT_GDB_VERSION}" \ "${linaro_base_url}/${linaro_series}/${linaro_version}/+download" |