diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-22 10:30:26 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-22 10:30:26 +0000 |
| commit | b63bacb7ed2cda177c0198f32f93290600912907 (patch) | |
| tree | 4ac37749b8e696206c6ae2b532d9c9858c54d9bf /eclass/toolchain.eclass | |
| parent | Multilib cleanups and don't use einstall. Use proper toolchain CC. Added to... (diff) | |
| download | historical-b63bacb7ed2cda177c0198f32f93290600912907.tar.gz historical-b63bacb7ed2cda177c0198f32f93290600912907.tar.bz2 historical-b63bacb7ed2cda177c0198f32f93290600912907.zip | |
Fix multilib LDPATH thanks to Dario Birtic. Closes bug #86218.
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index c712e583895a..7c6b1356a7ee 100644 --- 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.133 2005/03/21 06:01:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.134 2005/03/22 10:30:26 eradicator Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -613,7 +613,7 @@ create_gcc_env_entry() { local abi=${DEFAULT_ABI} local MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory) - if [[ ${MULTIDIR} != "." ]] ; then + if [[ ${MULTIDIR} == "." ]] ; then LDPATH="${LIBPATH}" else LDPATH="${LIBPATH}/${MULTIDIR}" @@ -622,7 +622,8 @@ create_gcc_env_entry() { for abi in $(get_all_abis) ; do [[ ${abi} == ${DEFAULT_ABI} ]] && continue - if [[ ${MULTIDIR} != "." ]] ; then + MULTIDIR=$(${XGCC} $(get_abi_CFLAGS ${abi}) --print-multi-directory) + if [[ ${MULTIDIR} == "." ]] ; then LDPATH="${LDPATH}:${LIBPATH}" else LDPATH="${LDPATH}:${LIBPATH}/${MULTIDIR}" |