sys-libs/glibc: Do not reset multilib vars unless cross-compiling, #588368

Do not call multilib_env_reset unless cross-compiling, in order to
prevent the function from redefining profile-defined variables such as
LIBDIR_*.

diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index e56f10eb52ba16ec2e9657fb37704ede8941a627..370782b4b4f3d3ca517e386bc832904d55e3f75a 100644 (file)
--- 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