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>
This commit is contained in:
Bryan Hundven 2014-12-08 23:27:46 -08:00
parent 6bc5ff9ce8
commit 1e17619b27
2 changed files with 2 additions and 2 deletions

View File

@ -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} \

View File

@ -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 \