[Sbcl-commits] CVS: sbcl/contrib/sb-grovel def-to-lisp.lisp,1.20,1.21

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/contrib/sb-grovel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18945/contrib/sb-grovel

Modified Files:
	def-to-lisp.lisp 
Log Message:
0.9.11.35: better package locking and more cleaning up after .31
 * package lock violations from lexical operations always cause
    runtime PROGRAM-ERRORs
 * better EXTRA_CFLAGS handling in SB-GROVEL


Index: def-to-lisp.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/contrib/sb-grovel/def-to-lisp.lisp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- def-to-lisp.lisp	14 Apr 2006 06:38:15 -0000	1.20
+++ def-to-lisp.lisp	14 Apr 2006 08:18:20 -0000	1.21
@@ -5,6 +5,15 @@
 (defun escape-for-string (string)
   (c-escape string))
 
+(defun split-cflags (string)
+  (remove-if (lambda (flag)
+               (zerop (length flag)))
+             (loop
+                for start = 0 then (if end (1+ end) nil)
+                for end = (and start (position #\Space string :start start))
+                while start
+                collect (subseq string start end))))
+
 (defun c-escape (string &optional (dangerous-chars '(#\")) (escape-char #\\))
   "Escape DANGEROUS-CHARS in STRING, with ESCAPE-CHAR."
   (coerce (loop for c across string
@@ -178,9 +187,7 @@
                  (sb-ext:run-program
                   "gcc"
                   (append
-                   (let ((cf (sb-ext:posix-getenv "EXTRA_CFLAGS")))
-                     (when (plusp (length cf))
-                       (list cf)))
+                   (split-cflags (sb-ext:posix-getenv "EXTRA_CFLAGS"))
                    (list "-o"
                          (namestring tmp-a-dot-out)
                          (namestring tmp-c-source)))