[Lunar-commits] r18965 - lunar/trunk/var/lib/lunar/plugins

[Auke Kok]

Author: sofar
Date: 2006-03-01 16:00:36 +0000 (Wed, 01 Mar 2006)
New Revision: 18965

Modified:
   lunar/trunk/var/lib/lunar/plugins/optimize-wrappers.plugin
Log:
* enable USE_WRAPPERS to be overridden by the user (`lunar set USE_WRAPPERS no`)
* insert COMPILER_PATH env into PATH


Modified: lunar/trunk/var/lib/lunar/plugins/optimize-wrappers.plugin
===================================================================
--- lunar/trunk/var/lib/lunar/plugins/optimize-wrappers.plugin	2006-03-01 15:57:46 UTC (rev 18964)
+++ lunar/trunk/var/lib/lunar/plugins/optimize-wrappers.plugin	2006-03-01 16:00:36 UTC (rev 18965)
@@ -4,14 +4,15 @@
 
 plugin_wrappers_optimize()
 {
-
-	if [ -f /etc/lunar/local/optimizations.WRAPPERS ]; then
-		. /etc/lunar/local/optimizations.WRAPPERS
+	if [[ -n "$USE_WRAPPERS" ]] ; then
+		if [ -f /etc/lunar/local/optimizations.WRAPPERS ]; then
+			. /etc/lunar/local/optimizations.WRAPPERS
+		fi
 	fi
 	
 	if [ "${USE_WRAPPERS:-yes}" == "yes" ]; then
 		verbose_msg "Enabled wrapper script usage"
-		export PATH=/var/lib/lunar/compilers/:${PATH}
+		export PATH=/var/lib/lunar/compilers/:${COMPILER_PATH}:${PATH}
 	fi
 	return 2
 }