diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2015-05-26 14:25:16 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2015-05-26 14:25:16 +0000 |
| commit | 96f22951082846a1642c938240e46f42675e8bff (patch) | |
| tree | 2fa09222dbf94ebab47565ac9c86d8bf1a2b63eb /eclass | |
| parent | Explicitly disable javascript plugin support (bug #550220). (diff) | |
| download | gentoo-2-96f22951082846a1642c938240e46f42675e8bff.tar.gz gentoo-2-96f22951082846a1642c938240e46f42675e8bff.tar.bz2 gentoo-2-96f22951082846a1642c938240e46f42675e8bff.zip | |
export FC/F77 for multilib support
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib.eclass | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 6cac17b9dba8..680ea00eacb0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1623 2015/05/25 18:18:00 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1624 2015/05/26 14:25:16 ottxor Exp $ + + 26 May 2015; Christoph Junghans <ottxor@gentoo.org> multilib.eclass: + export FC/F77 for multilib support 25 May 2015; Andreas K. Huettel <dilfridge@gentoo.org> perl-module.eclass: Remove long-deprecated and just dieing function stubs diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index b3e9903de32c..b32a95563e33 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.106 2014/07/11 08:21:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.107 2015/05/26 14:25:16 ottxor Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -415,7 +415,7 @@ multilib_toolchain_setup() { # First restore any saved state we have laying around. if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then - for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} @@ -427,7 +427,7 @@ multilib_toolchain_setup() { # screws up ccache and distcc. See #196243 for more info. if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later - for v in CHOST CBUILD AS CC CXX LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done @@ -438,6 +438,8 @@ multilib_toolchain_setup() { export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) export CC="$(tc-getCC) $(get_abi_CFLAGS)" export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" + export F77="$(tc-getF77) $(get_abi_CFLAGS)" + export FC="$(tc-getFC) $(get_abi_CFLAGS)" export LD="$(tc-getLD) $(get_abi_LDFLAGS)" export CHOST=$(get_abi_CHOST $1) export CBUILD=$(get_abi_CHOST $1) |