From 91cf168d7698524543b1455cda17b9269343093d Mon Sep 17 00:00:00 2001 From: Bryan Hundven Date: Mon, 8 Dec 2014 23:46:41 -0800 Subject: [PATCH] gcc and gdb: fix fetching linaro builds (part three) Yes, I missed the backslash which messed up the linaro stuff. The more I look at this code, I feel it needs to be refactored a bit. So I'll come back to this in the future and clean it up. Signed-off-by: Bryan Hundven --- scripts/build/cc/gcc.sh | 3 ++- scripts/build/debug/300-gdb.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh index d3c4cb55..632bc8cc 100644 --- a/scripts/build/cc/gcc.sh +++ b/scripts/build/cc/gcc.sh @@ -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. + 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 22e4de7c..dea5eae7 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -54,7 +54,7 @@ do_debug_gdb_get() { if [ x"${linaro_release}" = 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"