From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 24 May 2006 08:12:48 +0000 (-0000)
Subject: When /usr/lib/distcc/bin does not exist, only add a maximum of one distcc to CC and... 
X-Git-Tag: v2.1~65
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5c664d150b60960f248898b02ec6fd07be2beb4;p=portage.git

When /usr/lib/distcc/bin does not exist, only add a maximum of one distcc to CC and CXX for bug #84150.

svn path=/main/trunk/; revision=3408
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 31f32ed8a..bfe9e072d 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1348,8 +1348,12 @@ if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "setup" ]; then
 			export PATH="/usr/lib/distcc/bin:${PATH}"
 			[ ! -z "${DISTCC_LOG}" ] && addwrite "$(dirname ${DISTCC_LOG})"
 		elif which distcc &>/dev/null; then
-			export CC="distcc $CC"
-			export CXX="distcc $CXX"
+			if ! hasq distcc $CC; then
+				export CC="distcc $CC"
+			fi
+			if ! hasq distcc $CXX; then
+				export CXX="distcc $CXX"
+			fi
 		fi
 	fi