diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-18 19:12:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 19:12:08 +0000 |
| commit | ec13df078564482856fcdf3991d87973155c74d3 (patch) | |
| tree | 99353d72453b5f9e48f33913ac420695945bee75 /eclass | |
| parent | Version bump. Bug fixes. (diff) | |
| download | gentoo-2-ec13df078564482856fcdf3991d87973155c74d3.tar.gz gentoo-2-ec13df078564482856fcdf3991d87973155c74d3.tar.bz2 gentoo-2-ec13df078564482856fcdf3991d87973155c74d3.zip | |
use "lib" for x86 ABI when SYMLINK_LIBDIR=no
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/multilib.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index c74a71d77c1b..a260d09818d7 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.85 2011/03/16 20:09:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.86 2011/03/18 19:12:08 vapier Exp $ # @ECLASS: multilib.eclass # @MAINTAINER: @@ -582,7 +582,11 @@ multilib_env() { export CHOST_x86=${CTARGET/x86_64/i686} export CTARGET_x86=${CHOST_x86} export CDEFINE_x86="__i386__" - export LIBDIR_x86="lib32" + if [[ ${SYMLINK_LIBDIR} == "yes" ]] ; then + export LIBDIR_x86="lib32" + else + export LIBDIR_x86="lib" + fi export CFLAGS_amd64=${CFLAGS_amd64--m64} export CHOST_amd64=${CTARGET} |