Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 31 Jul 2020 20:44:03
Message-Id: 1596228124.8a3327cc47bb53d42547d01ac1135ba0c417330f.slyfox@gentoo
1 commit: 8a3327cc47bb53d42547d01ac1135ba0c417330f
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 31 18:33:36 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 31 20:42:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a3327cc
7
8 toolchain.eclass: drop handling of /usr/lib/gcc-lib for gcc-3.3
9
10 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
11
12 eclass/toolchain.eclass | 6 +-----
13 1 file changed, 1 insertion(+), 5 deletions(-)
14
15 diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
16 index ee1d5f5d541..78f805f7454 100644
17 --- a/eclass/toolchain.eclass
18 +++ b/eclass/toolchain.eclass
19 @@ -99,11 +99,7 @@ fi
20
21 PREFIX=${TOOLCHAIN_PREFIX:-${EPREFIX}/usr}
22
23 -if tc_version_is_at_least 3.4.0 ; then
24 - LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
25 -else
26 - LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc-lib/${CTARGET}/${GCC_CONFIG_VER}}
27 -fi
28 +LIBPATH=${TOOLCHAIN_LIBPATH:-${PREFIX}/lib/gcc/${CTARGET}/${GCC_CONFIG_VER}}
29 INCLUDEPATH=${TOOLCHAIN_INCLUDEPATH:-${LIBPATH}/include}
30
31 if is_crosscompile ; then