[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2013-04-18-g431765c

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  431765cfb80004b7bbde8cc6dcd43bbfc1e17e4c (commit)
      from  e6aeed9a036e71f217f5de8db8e497ec4a606253 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 431765cfb80004b7bbde8cc6dcd43bbfc1e17e4c
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sat May 4 12:45:30 2013 -0700

    Remove the -M option that was recently added.
    
    This isn't needed since we no longer set CC in the Config files.
    
     bin/build.sh::
     * Revert change that added -M
    
     bin/rebuild-lisp.sh::
     * Remove the -M option, but leave in the getops and usage changes so
       we get a little command help if needed.

diff --git a/bin/build.sh b/bin/build.sh
index fa0b3df..496d641 100755
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -96,7 +96,6 @@ usage ()
     echo "               The flags always include -noinit -nositeinit"
     echo "    -R        Force recompiling the C runtime.  Normally, just runs make to "
     echo "               recompile anything that has changed."
-    echo "    -M opt    Additional flags to be passed to make."
     exit 1
 }
 
@@ -128,17 +127,13 @@ buildit ()
 	$TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; }
 	time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; }
 	if [ "$REBUILD_LISP" = "yes" ]; then
-	    if [ -z $MFLAGS ]; then
-		$TOOLDIR/rebuild-lisp.sh $TARGET
-	    else
-		$TOOLDIR/rebuild-lisp.sh -M "$MFLAGS" $TARGET
-	    fi
+	    $TOOLDIR/rebuild-lisp.sh $TARGET
 	else
 	    # Set the LANG to C.  For whatever reason, if I (rtoy) don't
 	    # do this on my openSuSE system, any messages from gcc are
 	    # basically garbled.  This should be harmless on other
 	    # systems.
-	    LANG=C $MAKE -C $TARGET/lisp $MFLAGS $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
+	    LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; }
         fi
 
 	if [ "$BUILD_WORLD2" = "yes" ];
@@ -157,7 +152,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh"
 BUILD_POT="yes"
 UPDATE_TRANS=
 
-while getopts "123PRo:b:v:uB:C:Ui:f:w:O:M:?" arg
+while getopts "123PRo:b:v:uB:C:Ui:f:w:O:?" arg
 do
     case $arg in
 	1) ENABLE2="no" ;;
@@ -177,7 +172,6 @@ do
         U) UPDATE_TRANS="yes";;
 	O) OLDLISPFLAGS="$OLDLISPFLAGS $OPTARG" ;;
         R) REBUILD_LISP="yes";;
-        M) MFLAGS="$OPTARG" ;;
 	\?) usage
 	    ;;
     esac
diff --git a/bin/rebuild-lisp.sh b/bin/rebuild-lisp.sh
index 1e49d01..7d81f56 100755
--- a/bin/rebuild-lisp.sh
+++ b/bin/rebuild-lisp.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-while getopts "M:h?" arg
+while getopts "h?" arg
 do
     case $arg in
-      M) MFLAGS="$OPTARG" ;;
       h) usage ;;
       \?) usage ;;
     esac
@@ -11,11 +10,11 @@ done
 
 usage() 
 {
-    echo "rebuild.-lisp.sh [-h?] [-M opts] target-directory"
+    echo "rebuild.-lisp.sh [-h?] target-directory"
     echo "    -h        this help"
     echo "    -?        this help"
-    echo "    -M opts   Options to pass to make"
-
+    echo ""
+    echo "Force recompiling all the C code in the specified directory".
 }
 
 shift `expr $OPTIND - 1`
@@ -43,4 +42,4 @@ fi
 
 export MAKE
 
-${MAKE} -C $TARGET/lisp $MFLAGS clean && ${MAKE} -C $TARGET/lisp $MFLAGS
+${MAKE} -C $TARGET/lisp clean && ${MAKE} -C $TARGET/lisp

-----------------------------------------------------------------------

Summary of changes:
 bin/build.sh        |   12 +++---------
 bin/rebuild-lisp.sh |   11 +++++------
 2 files changed, 8 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp