[Lunar-commits] r26146 - in moonbase/trunk: distributed/distcc/plugin.d utils/ccache/plugin.d

[Stefan Wold]

Author: ratler
Date: 2007-10-10 12:38:03 +0200 (Wed, 10 Oct 2007)
New Revision: 26146

Modified:
   moonbase/trunk/distributed/distcc/plugin.d/optimize-distcc.plugin
   moonbase/trunk/utils/ccache/plugin.d/optimize-ccache.plugin
Log:
These changes fixes a recursive problem when a module trigger another lin -c from POST_INSTALL which cause CC_EXT and CXX_EXT to get multiple entries of ccache and distcc.

Modified: moonbase/trunk/distributed/distcc/plugin.d/optimize-distcc.plugin
===================================================================
--- moonbase/trunk/distributed/distcc/plugin.d/optimize-distcc.plugin	2007-10-09 21:40:44 UTC (rev 26145)
+++ moonbase/trunk/distributed/distcc/plugin.d/optimize-distcc.plugin	2007-10-10 10:38:03 UTC (rev 26146)
@@ -12,8 +12,8 @@
 	if [ "$USE_DISTCC" == "yes" ]; then
 		# we append distcc in case ccache is also used to
 		# make sure that distcc goes first!
-		CC_EXT="$CC_EXT distcc"
-		CXX_EXT="$CXX_EXT distcc"
+	        echo $CC_EXT | grep -q "distcc" || CC_EXT="$CC_EXT distcc"
+		echo $CXX_EXT | grep -q "distcc" || CXX_EXT="$CXX_EXT distcc"
 		export CC_EXT
 		export CXX_EXT
 		export DISTCC_HOSTS

Modified: moonbase/trunk/utils/ccache/plugin.d/optimize-ccache.plugin
===================================================================
--- moonbase/trunk/utils/ccache/plugin.d/optimize-ccache.plugin	2007-10-09 21:40:44 UTC (rev 26145)
+++ moonbase/trunk/utils/ccache/plugin.d/optimize-ccache.plugin	2007-10-10 10:38:03 UTC (rev 26146)
@@ -12,8 +12,8 @@
 	if [ "$USE_CCACHE" == "yes" ]; then
 		# we PRE-pend ccache in case distcc is also used to
 		# make sure that ccache goes first!
-		CC_EXT="ccache $CC_EXT"
-		CXX_EXT="ccache $CXX_EXT"
+	        echo $CC_EXT | grep -q "ccache" || CC_EXT="ccache $CC_EXT"
+		echo $CXX_EXT | grep -q "ccache" || CXX_EXT="ccache $CXX_EXT"
 		export CC_EXT
 		export CXX_EXT
 		verbose_msg "CC_EXT=\"$CC_EXT\""