diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-05-19 03:16:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-05-19 03:16:40 +0000 |
| commit | 6b69394b4c72e30698d1fb713f81675976b012f6 (patch) | |
| tree | b1a98b12eab81be8657593b78ebda584d5498ccf /eclass | |
| parent | svn snapshot from today... (diff) | |
| download | gentoo-2-6b69394b4c72e30698d1fb713f81675976b012f6.tar.gz gentoo-2-6b69394b4c72e30698d1fb713f81675976b012f6.tar.bz2 gentoo-2-6b69394b4c72e30698d1fb713f81675976b012f6.zip | |
tweaks for gcc-4.2.0
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index d060cf5606a1..5a8861d8987d 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # 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.333 2007/05/03 04:51:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.334 2007/05/19 03:16:40 vapier Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -152,14 +152,9 @@ else IUSE="${IUSE} ip28 ip32r10k n32 n64" fi - # these are features introduced in 4.0 - if tc_version_is_at_least "4.0" ; then - IUSE="${IUSE} objc-gc mudflap" - - if tc_version_is_at_least "4.1" ; then - IUSE="${IUSE} objc++" - fi - fi + tc_version_is_at_least "4.0" && IUSE="${IUSE} objc-gc mudflap" + tc_version_is_at_least "4.1" && IUSE="${IUSE} objc++" + tc_version_is_at_least "4.2" && IUSE="${IUSE} openmp" fi fi @@ -672,12 +667,6 @@ create_gcc_env_entry() { fi echo "LDPATH=\"${LDPATH}\"" >> ${gcc_envd_file} - - local mbits - CC=$(XGCC) has_m32 && mbits="${mbits:+${mbits} }32" - CC=$(XGCC) has_m64 && mbits="${mbits:+${mbits} }64" - echo "GCCBITS=\"${mbits}\"" >> ${gcc_envd_file} - echo "MANPATH=\"${DATAPATH}/man\"" >> ${gcc_envd_file} echo "INFOPATH=\"${DATAPATH}/info\"" >> ${gcc_envd_file} echo "STDCXX_INCDIR=\"${STDCXX_INCDIR##*/}\"" >> ${gcc_envd_file} @@ -1119,7 +1108,7 @@ gcc_src_unpack() { einfo "Touching generated files" ./contrib/gcc_update --touch | \ while read f ; do - einfo " ${f%%...}" + einfo " ${f%%...}" done fi @@ -1298,10 +1287,6 @@ gcc_do_configure() { fi elif [[ ${CHOST} != mingw* ]] && [[ ${CHOST} != *-mingw* ]] ; then confgcc="${confgcc} --enable-shared --enable-threads=posix" - - if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then - confgcc="${confgcc} --enable-bootstrap" - fi fi [[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib" # __cxa_atexit is "essential for fully standards-compliant handling of |