From fd522eed500576a6e62431724314858e120679c6 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Sun, 9 Jul 2017 23:08:12 -0700
Subject: Resolve a few more TBDs

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 scripts/build/cc/gcc.sh         | 9 +++++----
 scripts/build/debug/200-duma.sh | 1 -
 scripts/functions               | 7 +++----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 2f0d3f79..6019b35a 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -14,10 +14,11 @@ do_cc_get() {
     # GCC source tree, which will not be there unless we get it and
     # put it there ourselves
     if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
-        # TBD check return code
-        CT_GetFile ecj-latest .jar http://mirrors.kernel.org/sourceware/java/ \
-                                   ftp://gcc.gnu.org/pub/java                 \
-                                   ftp://sourceware.org/pub/java
+        if ! CT_GetFile ecj-latest .jar $(CT_Mirrors sourceware java); then
+            # Should be a package, too - but with Java retirement in GCC,
+            # it may not make sense.
+            CT_Abort "Failed to download ecj-latest.jar"
+        fi
     fi
 }
 
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index afaeb027..bd350304 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -1,7 +1,6 @@
 # Build script for D.U.M.A.
 
 do_debug_duma_get() {
-    # TBD need cleanup after sourceforge.net download?
     CT_Fetch DUMA
 }
 
diff --git a/scripts/functions b/scripts/functions
index a7dd5412..79b7321b 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1460,10 +1460,9 @@ CT_Mirrors()
         echo "ftp://ftp.gnu.org/gnu/${project}"
         ;;
     sourceware)
-        local subdir="${3:+/${3}}"
-        echo "ftp://sourceware.org/pub/${project}/releases${subdir}"
-        echo "http://mirrors.kernel.org/sourceware/${project}/releases${subdir}"
-        echo "http://gcc.gnu.org/pub/${project}/releases${subdir}"
+        echo "ftp://sourceware.org/pub/${project}"
+        echo "http://mirrors.kernel.org/sourceware/${project}"
+        echo "http://gcc.gnu.org/pub/${project}"
         ;;
     Linaro)
         eval "local version=\"\${${3}}\""
-- 
cgit v1.2.3