From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 8 Jul 2016 22:03:15 +0000 (+0200)
Subject: sys-libs/glibc: Do not reset multilib vars unless cross-compiling, #588368
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ffc59b9e2bbe9ad89a1ab60e3a147785fe944141;p=gentoo.git

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 e56f10eb52ba..370782b4b4f3 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