Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 336045
Collapse All | Expand All

(-)toolchain.eclass (-4 / +13 lines)
Lines 367-375 Link Here
367
	# >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
367
	# >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
368
	# conditions
368
	# conditions
369
	if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
369
	if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
370
		tc_version_is_at_least "4.3" && \
370
		if tc_version_is_at_least "4.5" ; then
371
			GCC_SRC_URI="${GCC_SRC_URI}
372
			gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
373
		elif tc_version_is_at_least "4.3" ; then
371
			GCC_SRC_URI="${GCC_SRC_URI}
374
			GCC_SRC_URI="${GCC_SRC_URI}
372
			gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
375
			gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
376
		fi
373
	fi
377
	fi
374
378
375
	echo "${GCC_SRC_URI}"
379
	echo "${GCC_SRC_URI}"
Lines 1057-1065 Link Here
1057
	fi
1061
	fi
1058
1062
1059
	# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
1063
	# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
1060
	if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
1064
	if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then
1061
		use gcj ; then
1065
		if tc_version_is_at_least "4.5" ; then
1062
		cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
1066
			einfo "Copying ecj-4.5.jar"
1067
			cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
1068
		elif tc_version_is_at_least "4.3" ; then
1069
			einfo "Copying ecj-4.3.jar"
1070
			cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
1071
		fi
1063
	fi
1072
	fi
1064
1073
1065
	# disable --as-needed from being compiled into gcc specs
1074
	# disable --as-needed from being compiled into gcc specs

Return to bug 336045