diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2013-05-15 05:42:09 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2013-05-15 05:42:09 +0000 |
| commit | 7d5fe466692f5e211c5f2ceff6e1e88f5453c960 (patch) | |
| tree | 66773b470212fe07d0a6678b2de01f441580e7b5 /eclass | |
| parent | Fix metadata.xml (diff) | |
| download | gentoo-2-7d5fe466692f5e211c5f2ceff6e1e88f5453c960.tar.gz gentoo-2-7d5fe466692f5e211c5f2ceff6e1e88f5453c960.tar.bz2 gentoo-2-7d5fe466692f5e211c5f2ceff6e1e88f5453c960.zip | |
Explicitly disable lto in 4.5 to stop configure from helpfully re-enabling it when libelf is present.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 596c0e8255b1..7525a50cb537 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.823 2013/05/15 00:56:49 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.824 2013/05/15 05:42:09 dirtyepic Exp $ + + 15 May 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: + Explicitly disable lto in 4.5 to stop configure from helpfully re-enabling it + when libelf is present. 15 May 2013; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass: Rename test USE flag to regression-test. diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 04c07fe0e1ef..a2d7113aa09e 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.589 2013/05/15 00:56:49 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.590 2013/05/15 05:42:09 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1100,7 +1100,11 @@ gcc_do_configure() { confgcc+=" --without-ppl" fi - tc_version_is_at_least "4.6" && confgcc+=" $(use_enable lto)" + if tc_version_is_at_least "4.6" ; then + confgcc+=" $(use_enable lto)" + elif tc_version_is_at_least "4.5" ; then + confgcc+=" --disable-lto" + fi case $(tc-is-softfloat) in yes) confgcc+=" --with-float=soft" ;; |