remove USE=static #85318

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index b7247ad718a19b9474260614faadd6868862091d..2eca6581c7fbdbcc10dd90ac67dbcf70dd765c8c 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.214 2005/11/04 02:32:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.215 2005/11/05 23:14:17 vapier Exp $
 
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
@@ -126,7 +126,7 @@ if [[ ${ETYPE} == "gcc-library" ]] ; then
        IUSE="nls build"
        SLOT="${CTARGET}-${SO_VERSION_SLOT:-5}"
 else
-       IUSE="altivec bootstrap build fortran gcj gtk hardened ip28 multilib multislot n32 n64 nls nocxx objc static vanilla"
+       IUSE="altivec bootstrap build fortran gcj gtk hardened ip28 multilib multislot n32 n64 nls nocxx objc vanilla"
        [[ -n ${PIE_VER}    ]] && IUSE="${IUSE} nopie"
        [[ -n ${PP_VER}     ]] && IUSE="${IUSE} nossp"
        [[ -n ${HTB_VER}    ]] && IUSE="${IUSE} boundschecking"
@@ -1170,7 +1170,7 @@ gcc_do_configure() {
                        *-gnu)      needed_libc=glibc;;
                        *-klibc)    needed_libc=klibc;;
                        *-uclibc)   needed_libc=uclibc;;
-                       avr)        confgcc="${confgcc} $(use_enable !static shared) --disable-threads";;
+                       avr)        confgcc="${confgcc} --enable-shared --disable-threads";;
                esac
                if [[ -n ${needed_libc} ]] ; then
                        if ! has_version ${CATEGORY}/${needed_libc} ; then
@@ -1180,7 +1180,7 @@ gcc_do_configure() {
                        fi
                fi
        else
-               confgcc="${confgcc} $(use_enable !static shared) --enable-threads=posix"
+               confgcc="${confgcc} --enable-shared --enable-threads=posix"
        fi
        # __cxa_atexit is "essential for fully standards-compliant handling of
        # destructors", but apparently requires glibc.
@@ -1244,12 +1244,6 @@ gcc_do_configure() {
 # Travis Tilley <lv@gentoo.org> (04 Sep 2004)
 #
 gcc_do_make() {
-       # Only build it static if we are just building the C frontend, else
-       # a lot of things break because there are not libstdc++.so ....
-       if use static && [[ ${GCC_LANG} == "c" ]] ; then
-               append-ldflags -static
-       fi
-
        # Fix for libtool-portage.patch
        local OLDS=${S}
        S=${WORKDIR}/build