diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2013-04-17 02:31:58 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2013-04-17 02:31:58 +0000 |
| commit | 11e1f2055469dcfbaf2c1c5beb8d455fb11b3861 (patch) | |
| tree | 2efe90ddb71e743df9175802137c61ebe1201b27 /eclass | |
| parent | Multiarch got backported to 4.6/4.7. 4.6.4 will be handled by patch since th... (diff) | |
| download | historical-11e1f2055469dcfbaf2c1c5beb8d455fb11b3861.tar.gz historical-11e1f2055469dcfbaf2c1c5beb8d455fb11b3861.tar.bz2 historical-11e1f2055469dcfbaf2c1c5beb8d455fb11b3861.zip | |
Since this is conditional code 4.6.4 will have to be handled here after all.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 6ec4ec8a6db8..e8b72c9a85e4 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.582 2013/04/17 02:12:36 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.583 2013/04/17 02:31:58 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas <toolchain@gentoo.org> @@ -1970,12 +1970,12 @@ setup_multilib_osdirnames() { config+="/t-linux64" local sed_args=() - if tc_version_is_at_least 4.7 ; then + if tc_version_is_at_least 4.6 ; then sed_args+=( -e 's:$[(]call if_multiarch[^)]*[)]::g' ) fi if [[ ${SYMLINK_LIB} == "yes" ]] ; then einfo "updating multilib directories to be: ${libdirs}" - if tc_version_is_at_least 4.7 ; then + if tc_version_is_at_least 4.6.4 || tc_version_is_at_least 4.7 ; then sed_args+=( -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' ) else sed_args+=( -e "/^MULTILIB_OSDIRNAMES/s:=.*:= ${libdirs}:" ) |