From 1e17619b273fb49f8d2e162f34c26994698285b3 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Mon, 8 Dec 2014 23:27:46 -0800
Subject: gcc and gdb: fix fetching linaro builds (part two)

It's not my day.

linaro_version is a filter. If it is not a linaro toolchain, it will
just be CT_{CC,GDB}_VERSION. If it is a linaro toolchain, CT_{CC,GDB}_VERSION
will be prefixed with 'linaro-' and will not match linaro_version, as
linaro_version will just have the part after 'linaro-'.

This *really* fixes the issue :sigh:

Thanks again to @elsonwei for being right the first time!

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 3d26d0c..d3c4cb5 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -22,7 +22,7 @@ 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
+        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}                  \
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index df0e1e3..22e4de7 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"" ]; then
+            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          \
-- 
cgit v0.10.2-6-g49f6