[gentoo-dev] [PATCH 1/4] sys-libs/glibc: Do not reset multilib vars unless cross-compilnig, #588368

[Michał Górny]

Do not call multilib_env_reset unless cross-compiling, in order to
prevent the function from redefining profile-defined variables such as
LIBDIR_*.
---
 sys-libs/glibc/files/eblits/common.eblit | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-libs/glibc/files/eblits/common.eblit 
b/sys-libs/glibc/files/eblits/common.eblit
index e56f10e..370782b 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -318,8 +318,9 @@ setup_env() {
        unset LD_RUN_PATH
        unset LD_ASSUME_KERNEL
 
-       multilib_env ${CTARGET_OPT:-${CTARGET}}
        if is_crosscompile || tc-is-cross-compiler ; then
+               multilib_env ${CTARGET_OPT:-${CTARGET}}
+
                if ! use multilib ; then
                        MULTILIB_ABIS=${DEFAULT_ABI}
                else
-- 
2.9.0