diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/cc/gcc.sh | 9 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 8 |
2 files changed, 9 insertions, 8 deletions
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" |