1.1 --- a/scripts/build/cc/gcc.sh Thu Oct 11 14:39:41 2012 +1000
1.2 +++ b/scripts/build/cc/gcc.sh Tue Nov 06 17:02:06 2012 +0100
1.3 @@ -4,31 +4,13 @@
1.4
1.5 # Download gcc
1.6 do_cc_get() {
1.7 + local linaro_version
1.8 + local linaro_series
1.9 + local linaro_base_url="http://launchpad.net/gcc-linaro"
1.10 +
1.11 if [ "${CT_CC_CUSTOM}" = "y" ]; then
1.12 CT_GetCustom "gcc" "${CT_CC_VERSION}" "${CT_CC_CUSTOM_LOCATION}"
1.13 - elif [ -n "${CT_CC_V_SVN}" ]; then
1.14 - # Get gcc from SVN!
1.15 - local svn_base
1.16 -
1.17 - if [ "${CT_GCC_HTTP}" = "y" ]; then
1.18 - svn_base="http://gcc.gnu.org/svn/gcc"
1.19 - else
1.20 - svn_base="svn://gcc.gnu.org/svn/gcc"
1.21 - fi
1.22 -
1.23 - svn_base+="/${CT_GCC_BRANCH:-trunk}"
1.24 -
1.25 - CT_CC_VERSION="${CT_GCC_BRANCH//\//_}"
1.26 -
1.27 - CT_GetSVN "gcc-${CT_CC_VERSION}" \
1.28 - "${svn_base}/" \
1.29 - "${CT_GCC_REVISION:-HEAD}"
1.30 else
1.31 - local linaro_version
1.32 - local linaro_series
1.33 - local linaro_base_url="http://launchpad.net/gcc-linaro"
1.34 -
1.35 -
1.36 # Account for the Linaro versioning
1.37 linaro_version="$( echo "${CT_CC_VERSION}" \
1.38 |sed -r -e 's/^linaro-//;' \
1.39 @@ -48,7 +30,7 @@
1.40 ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION} \
1.41 "${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
1.42
1.43 - fi # -n ${CT_CC_V_SVN}
1.44 + fi # ! custom location
1.45 # Starting with GCC 4.3, ecj is used for Java, and will only be
1.46 # built if the configure script finds ecj.jar at the top of the
1.47 # GCC source tree, which will not be there unless we get it and