[Cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2014-11-32-g0ec3368

[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  0ec33685dff49b910b0c46644f983064c02ab949 (commit)
       via  394a28dfacbfe6d4557ed8f59152c58b17078f05 (commit)
      from  5f81e24180fa7721fcad38b9ae3419bd9f2a221d (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 0ec33685dff49b910b0c46644f983064c02ab949
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sun Nov 30 20:00:50 2014 -0800

    Remove lisp.a when cleaning; update usags.
    
     * make clean should remove lisp.a
     * Use $(RM) instead of rm.
     * Use $(AR) instead of ar.

diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile
index f67a20e..ad9b472 100644
--- a/src/lisp/GNUmakefile
+++ b/src/lisp/GNUmakefile
@@ -49,10 +49,10 @@ lisp: ${OBJS} version.o
 # builtin_image_flag to 1 so that the runtime knows the runtime
 # contains the core sections.
 lisp.a:	version.o ${OBJS} ${EXEC_FINAL_OBJ}
-	ar crs lisp.a ${OBJS} version.o
+	$(AR) crs lisp.a ${OBJS} version.o
 ifneq (${EXEC_FINAL_OBJ},)
-	ar d lisp.a exec-init.o
-	ar r lisp.a ${EXEC_FINAL_OBJ}
+	$(AR) d lisp.a exec-init.o
+	$(AR) r lisp.a ${EXEC_FINAL_OBJ}
 endif
 
 version:
@@ -63,7 +63,7 @@ internals.h internals.inc:
 	@false
 
 clean:
-	rm -f Depends *.o lisp lisp.nm core
+	$(RM) Depends *.o lisp lisp.nm core lisp.a
 	echo 'Map file for lisp version 0' > lisp.nm
 
 depend: Depends

commit 394a28dfacbfe6d4557ed8f59152c58b17078f05
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sun Nov 30 19:17:16 2014 -0800

    Don't bother to build clm or motifd on darwin/ppc. It's not likely
    we'll ever install motif on that machine.

diff --git a/bin/build-utils.sh b/bin/build-utils.sh
index e59fd19..18d6f60 100755
--- a/bin/build-utils.sh
+++ b/bin/build-utils.sh
@@ -36,6 +36,7 @@ $TARGET/lisp/lisp \
 (setq *gc-verbose* nil *interactive* nil)
 (load "target:tools/clxcom")
 (load "target:clx/clx-library")
+#-ppc
 (load "target:tools/clmcom")
 (load "target:tools/hemcom")
 
@@ -61,4 +62,17 @@ fi
 
 export MAKE
 
-${MAKE} -C $TARGET/motif/server clean && ${MAKE} -C $TARGET/motif/server
+# Don't bother building motifd on ppc; we'll probably never support that again.
+
+SKIPMOTIF=no
+case `uname -s` in
+  Darwin)
+      case `uname -p` in
+	powerpc) SKIPMOTIF=yes ;;
+      esac ;;
+esac
+
+if [ "$SKIPMOTIF" = "no" ]; then
+    ${MAKE} -C $TARGET/motif/server clean && ${MAKE} -C $TARGET/motif/server
+fi
+

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

Summary of changes:
 bin/build-utils.sh   | 16 +++++++++++++++-
 src/lisp/GNUmakefile |  8 ++++----
 2 files changed, 19 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp