diff options
| author |   Mark Loeser <halcy0n@gentoo.org> | 2009-05-07 01:45:55 +0000 |
|---|---|---|
| committer | Mark Loeser <halcy0n@gentoo.org> | 2009-05-07 01:45:55 +0000 |
| commit | adce77ad8f24a4f859cfccd124e6dab6e98058d3 (patch) | |
| tree | ab576cf4dccaae21d19a7fcfa973f805a1cb0a24 /eclass | |
| parent | Adding mask for gcc-4.4 (diff) | |
| download | historical-adce77ad8f24a4f859cfccd124e6dab6e98058d3.tar.gz historical-adce77ad8f24a4f859cfccd124e6dab6e98058d3.tar.bz2 historical-adce77ad8f24a4f859cfccd124e6dab6e98058d3.zip | |
There is only one version of the ecj.jar upstream currently, so we'll use the 4.3 one everywhere until they give us another version
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 6703dcd04e92..edc4a5b52c74 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.396 2009/04/04 16:52:40 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.397 2009/05/07 01:45:55 halcy0n Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -355,7 +355,7 @@ get_gcc_src_uri() { if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then tc_version_is_at_least "4.3" && \ GCC_SRC_URI="${GCC_SRC_URI} - gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )" + gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )" fi echo "${GCC_SRC_URI}" @@ -1114,7 +1114,7 @@ gcc_src_unpack() { # >= gcc-4.3 doesn't bundle ecj.jar, so copy it if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then - cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die + cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die fi # disable --as-needed from being compiled into gcc specs |