summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/cc/gcc.in64
-rw-r--r--scripts/build/cc/gcc.sh28
2 files changed, 5 insertions, 87 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 15b2d46..95c22f1 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -34,13 +34,6 @@ choice
bool
prompt "gcc version"
-config CC_V_SVN
- bool
- prompt "gcc from svn"
- depends on EXPERIMENTAL
- depends on CONFIGURE_has_svn
- select CC_GCC_latest
-
# Don't remove next line
# CT_INSERT_VERSION_BELOW
@@ -247,62 +240,6 @@ config CC_CUSTOM
endchoice
-if CC_V_SVN
-
-config GCC_BRANCH
- string
- prompt "Branch or tag to use"
- default "trunk"
- help
- Enter the branch of gcc to use. Default is trunk
-
- A few examples might be:
- * trunk
- * branches/gcc-4_7-branch
- * branches/gcc-4_4-branch
- * branches/gccgo
- * branches/google
- * tags/gcc_4_7_1_release
- * tags/microblaze-4.4.2
-
-config GCC_REVISION
- string
- prompt "Revision to use"
- default "HEAD"
- help
- Enter the revision of you want to use. Default is HEAD
-
- A revision argument can be one of:
- NUMBER revision number
- '{' DATE '}' revision at start of the date (*)
- 'HEAD' latest in repository
-
- (*) If you want to use a date, please use ISO-8601 formats if
- at all possible.
-
-config GCC_HTTP
- bool
- prompt "use http:// instead of svn://"
- help
- By default, when gcc is downloaded it is checked out using
- svn://gcc.gnu.org/svn/gcc. This option allows you to download gcc
- from http://gcc.gnu.org/svn/gcc, if you are behind a proxy or firewall.
- If you are behind a proxy, don't forget to update your
- .subversion/servers file with your proxy info in [global].
-
-config GCC_CHECKOUT
- bool
- prompt "checkout instead of export"
- help
- By default, the gcc download will be an export of the subversion
- repository. If you say 'y' here, then the repository will instead be
- checked-out, so that you can update it later.
-
- Note that crosstool-NG will *not* update your working copy, you will
- have to do that yourself.
-
-endif
-
if CC_CUSTOM
config CC_CUSTOM_LOCATION
@@ -461,7 +398,6 @@ config CC_GCC_HAS_LIBQUADMATH
config CC_VERSION
string
- default "SVN" if CC_V_SVN
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "linaro-4.7-2012.10" if CC_V_linaro_4_7_2012_10
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index 70f38a6..03ffa3a 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -4,31 +4,13 @@
# Download gcc
do_cc_get() {
+ local linaro_version
+ local linaro_series
+ local linaro_base_url="http://launchpad.net/gcc-linaro"
+
if [ "${CT_CC_CUSTOM}" = "y" ]; then
CT_GetCustom "gcc" "${CT_CC_VERSION}" "${CT_CC_CUSTOM_LOCATION}"
- elif [ -n "${CT_CC_V_SVN}" ]; then
- # Get gcc from SVN!
- local svn_base
-
- if [ "${CT_GCC_HTTP}" = "y" ]; then
- svn_base="http://gcc.gnu.org/svn/gcc"
- else
- svn_base="svn://gcc.gnu.org/svn/gcc"
- fi
-
- svn_base+="/${CT_GCC_BRANCH:-trunk}"
-
- CT_CC_VERSION="${CT_GCC_BRANCH//\//_}"
-
- CT_GetSVN "gcc-${CT_CC_VERSION}" \
- "${svn_base}/" \
- "${CT_GCC_REVISION:-HEAD}"
else
- local linaro_version
- local linaro_series
- local linaro_base_url="http://launchpad.net/gcc-linaro"
-
-
# Account for the Linaro versioning
linaro_version="$( echo "${CT_CC_VERSION}" \
|sed -r -e 's/^linaro-//;' \
@@ -48,7 +30,7 @@ do_cc_get() {
ftp://ftp.uvsq.fr/pub/gcc/snapshots/${CT_CC_VERSION} \
"${linaro_base_url}/${linaro_series}/${linaro_version}/+download"
- fi # -n ${CT_CC_V_SVN}
+ fi # ! custom location
# Starting with GCC 4.3, ecj is used for Java, and will only be
# built if the configure script finds ecj.jar at the top of the
# GCC source tree, which will not be there unless we get it and