From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 27 Mar 2009 04:29:33 +0000 (-0000)
Subject: Source bashrc after PATH tweaks inside ebuild_main(). (trunk r13184)
X-Git-Tag: v2.1.6.11~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9a3bd0cee51760bd73b6d76c543974cd30fe003;p=portage.git

Source bashrc after PATH tweaks inside ebuild_main(). (trunk r13184)

svn path=/main/branches/2.1.6/; revision=13213
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9ce5be334..f66de9aea 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1880,7 +1880,6 @@ if [ "${EBUILD_PHASE}" != "depend" ] ; then
 fi
 
 ebuild_main() {
-	source_all_bashrcs
 	local f x
 	local export_vars="ASFLAGS CCACHE_DIR CCACHE_SIZE
 		CFLAGS CXXFLAGS LDFLAGS LIBCFLAGS LIBCXXFLAGS"
@@ -1920,6 +1919,8 @@ ebuild_main() {
 		fi
 	fi
 
+	source_all_bashrcs
+
 	case ${EBUILD_SH_ARGS} in
 	nofetch)
 		ebuild_phase_with_hooks pkg_nofetch