diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-20 03:06:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-20 03:06:29 +0000 |
| commit | a9f1216d370dc28de0bbc277eb9a2a66dafdbf69 (patch) | |
| tree | 39806d3d658fda78bbd0a37ae742965fa6354adf /eclass/toolchain.eclass | |
| parent | rework how we handle tests/cross-compiling (diff) | |
| download | historical-a9f1216d370dc28de0bbc277eb9a2a66dafdbf69.tar.gz historical-a9f1216d370dc28de0bbc277eb9a2a66dafdbf69.tar.bz2 historical-a9f1216d370dc28de0bbc277eb9a2a66dafdbf69.zip | |
blah, second to last commit had too many local changes, make sure gcc-3.3.x libdir is set properly
Diffstat (limited to 'eclass/toolchain.eclass')
| -rw-r--r-- | eclass/toolchain.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 43652281ab4c..85be670d0532 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.186 2005/08/20 02:59:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.187 2005/08/20 03:06:29 vapier Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -90,7 +90,11 @@ fi PREFIX=${TOOLCHAIN_PREFIX:-/usr} if [[ ${GCC_VAR_TYPE} == "versioned" ]] ; then - LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}} + if version_is_at_least 3.4.0 ; then + LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}} + else + LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}} + fi LIBEXECPATH=${TOOLCHAIN_LIBEXE:-${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}} INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include} BINPATH=${TOOLCHAIN_BINPATH:-${PREFIX}/${CTARGET}/gcc-bin/${GCC_CONFIG_VER}} |