[Lunar-commits] r14859 - in lunar/trunk/var/lib/lunar: compilers functions

[Auke Kok]

Author: sofar
Date: 2005-05-20 09:07:15 +0000 (Fri, 20 May 2005)
New Revision: 14859

Added:
   lunar/trunk/var/lib/lunar/compilers/make
Modified:
   lunar/trunk/var/lib/lunar/functions/optimize.lunar
Log:
Adding a 'make wrapper' script, removed the alias as well. This should be much more decent and implements the preferred way to call 'make -jN'.


Added: lunar/trunk/var/lib/lunar/compilers/make
===================================================================
--- lunar/trunk/var/lib/lunar/compilers/make	2005-05-20 08:58:32 UTC (rev 14858)
+++ lunar/trunk/var/lib/lunar/compilers/make	2005-05-20 09:07:15 UTC (rev 14859)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
+
+if [ -n "$LUNAR_DEBUG" ] ; then
+  echo "++ $MAKE_EXT make ${MAKES:+-j$MAKES} \"$@\"" >&2
+fi
+
+$MAKE_EXT make ${MAKES:+-j$MAKES} "$@"
+


Property changes on: lunar/trunk/var/lib/lunar/compilers/make
___________________________________________________________________
Name: svn:executable
   + *
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: lunar/trunk/var/lib/lunar/functions/optimize.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-05-20 08:58:32 UTC (rev 14858)
+++ lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-05-20 09:07:15 UTC (rev 14859)
@@ -60,14 +60,8 @@
    unset MAKES
   fi
   if module_installed linux-openmosix; then
-    alias make="mosrun -h make"
-    if [[ "$MAKES" > 1 ]] ; then
-      alias make="mosrun -h make -j$MAKES"
-    fi
-  elif [[ $MAKES > 1 ]] ; then
-    alias make="make -j$MAKES"
+    $MAKE_EXT="$MAKE_EXT mosrun -h"
   fi
-  verbose_msg "make=\"$(which make)\", MAKES=\"$MAKES\""
 }
  
 
@@ -757,9 +751,10 @@
 
   export CC_EXT
   export CXX_EXT
-  export CFLAGS
+  export MAKE_EXT
   export COPT
   export CCOPT
+  export CFLAGS
   export CXXFLAGS
   export LDFLAGS