Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 1/4] sys-libs/glibc: Do not reset multilib vars unless cross-compilnig, #588368
Date: Sat, 09 Jul 2016 21:02:18
Message-Id: 20160709210128.25449-2-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/4] New no-lib-symlink profile for developers by "Michał Górny"
1 Do not call multilib_env_reset unless cross-compiling, in order to
2 prevent the function from redefining profile-defined variables such as
3 LIBDIR_*.
4 ---
5 sys-libs/glibc/files/eblits/common.eblit | 3 ++-
6 1 file changed, 2 insertions(+), 1 deletion(-)
7
8 diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
9 index e56f10e..370782b 100644
10 --- a/sys-libs/glibc/files/eblits/common.eblit
11 +++ b/sys-libs/glibc/files/eblits/common.eblit
12 @@ -318,8 +318,9 @@ setup_env() {
13 unset LD_RUN_PATH
14 unset LD_ASSUME_KERNEL
15
16 - multilib_env ${CTARGET_OPT:-${CTARGET}}
17 if is_crosscompile || tc-is-cross-compiler ; then
18 + multilib_env ${CTARGET_OPT:-${CTARGET}}
19 +
20 if ! use multilib ; then
21 MULTILIB_ABIS=${DEFAULT_ABI}
22 else
23 --
24 2.9.0