diff options
Diffstat (limited to 'hardened/toolchain/branches/pieworld/eclass/toolchain.eclass')
| -rw-r--r-- | hardened/toolchain/branches/pieworld/eclass/toolchain.eclass | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass b/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass index b4152b8..92543d7 100644 --- a/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass +++ b/hardened/toolchain/branches/pieworld/eclass/toolchain.eclass @@ -1,12 +1,12 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.334 2007/05/19 03:16:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.339 2007/07/20 04:59:51 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> HOMEPAGE="http://gcc.gnu.org/" LICENSE="GPL-2 LGPL-2.1" -RESTRICT="nostrip" # cross-compilers need controlled stripping +RESTRICT="strip" # cross-compilers need controlled stripping #---->> eclass stuff <<---- inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails @@ -1016,6 +1016,7 @@ gcc-library_src_unpack() { : } guess_patch_type_in_dir() { + release_version="${release_version} p${PATCH_VER}" [[ -n $(ls "$1"/*.bz2 2>/dev/null) ]] \ && EPATCH_SUFFIX="patch.bz2" \ || EPATCH_SUFFIX="patch" @@ -1056,7 +1057,6 @@ do_gcc_rename_java_bins() { } gcc_src_unpack() { local release_version="Gentoo ${GCC_PVR}" - [[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc" gcc_quick_unpack @@ -1184,7 +1184,11 @@ gcc-compiler-configure() { fi if tc_version_is_at_least "4.0" ; then - confgcc="${confgcc} $(use_enable mudflap libmudflap)" + if has mudflap ${IUSE} ; then + confgcc="${confgcc} $(use_enable mudflap libmudflap)" + else + confgcc="${confgcc} --disable-libmudflap" + fi if want_libssp ; then confgcc="${confgcc} --enable-libssp" @@ -1206,16 +1210,21 @@ gcc-compiler-configure() { case $(tc-arch) in # Add --with-abi flags to set default MIPS ABI mips) - local mips_abi="" - use n64 && mips_abi="--with-abi=64" - use n32 && mips_abi="--with-abi=n32" - [[ -n ${mips_abi} ]] && confgcc="${confgcc} ${mips_abi}" - ;; + local mips_abi="" + use n64 && mips_abi="--with-abi=64" + use n32 && mips_abi="--with-abi=n32" + [[ -n ${mips_abi} ]] && confgcc="${confgcc} ${mips_abi}" + ;; + # Default arch for x86 is normally i386, lets give it a bump + # since glibc will do so based on CTARGET anyways + x86) + confgcc="${confgcc} --with-arch=${CTARGET%%-*}" + ;; # Enable sjlj exceptions for backward compatibility on hppa hppa) [[ ${GCC_PV:0:1} == "3" ]] && \ confgcc="${confgcc} --enable-sjlj-exceptions" - ;; + ;; esac GCC_LANG="c" |