X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-grovel%2Fdef-to-lisp.lisp;h=97f24357a444599c5d19d4380fa01622a8cea4c4;hb=1656e5415acddf6655569b8332e138c36640c08a;hp=f2621dac266c5a62f1847a56f4724be3a3381802;hpb=c3fa52250b540c0b859fd3beb80cf147108f0fc6;p=sbcl.git

diff --git a/contrib/sb-grovel/def-to-lisp.lisp b/contrib/sb-grovel/def-to-lisp.lisp
index f2621da..97f2435 100644
--- a/contrib/sb-grovel/def-to-lisp.lisp
+++ b/contrib/sb-grovel/def-to-lisp.lisp
@@ -16,6 +16,7 @@
 
 (defun c-escape (string &optional (dangerous-chars '(#\")) (escape-char #\\))
   "Escape DANGEROUS-CHARS in STRING, with ESCAPE-CHAR."
+  (declare (simple-string string))
   (coerce (loop for c across string
                 if (member c dangerous-chars) collect escape-char
                 collect c)
@@ -112,10 +113,12 @@ code:
     (dolist (def definitions)
       (destructuring-bind (type lispname cname &optional doc export) def
         (case type
-          (:integer
+          ((:integer :errno)
            (as-c "#ifdef" cname)
            (printf "(cl:defconstant ~A %d \"~A\")" lispname doc
                    cname)
+           (when (eql type :errno)
+             (printf "(cl:setf (get '~A 'errno) t)" lispname))
            (as-c "#else")
            (printf "(sb-int:style-warn \"Couldn't grovel for ~A (unknown to the C compiler).\")" cname)
            (as-c "#endif"))
@@ -153,8 +156,8 @@ code:
 (defclass grovel-constants-file (asdf:cl-source-file)
   ((package :accessor constants-package :initarg :package)
    (do-not-grovel :accessor do-not-grovel
-                     :initform nil
-                     :initarg :do-not-grovel)))
+                  :initform nil
+                  :initarg :do-not-grovel)))
 
 (define-condition c-compile-failed (compile-failed) ()
   (:report (lambda (c s)
@@ -187,11 +190,14 @@ code:
     (funcall (intern "C-CONSTANTS-EXTRACT" (find-package "SB-GROVEL"))
              filename tmp-c-source (constants-package component))
     (unless (do-not-grovel component)
-      (let* ((cc (or (sb-ext:posix-getenv "CC")
-                     ;; It might be nice to include a CONTINUE or
-                     ;; USE-VALUE restart here, but ASDF seems to insist
-                     ;; on handling the errors itself.
-                     (error "The CC environment variable has not been set in SB-GROVEL. Since this variable should always be set during the SBCL build process, this might indicate an SBCL with a broken contrib installation.")))
+      (let* ((cc (or (and (string/= (sb-ext:posix-getenv "CC") "")
+                          (sb-ext:posix-getenv "CC"))
+                     (if (member :sb-building-contrib *features*)
+                         (error "~@<The CC environment variable not set during ~
+                                 SB-GROVEL build.~:@>")
+                         (sb-int:style-warn
+                          "CC environment variable not set, SB-GROVEL falling back to \"cc\"."))
+                     "cc"))
              (code (sb-ext:process-exit-code
                     (sb-ext:run-program
                      cc
@@ -201,8 +207,18 @@ code:
                       '("-D_LARGEFILE_SOURCE"
                         "-D_LARGEFILE64_SOURCE"
                         "-D_FILE_OFFSET_BITS=64")
-                      #+(and x86-64 darwin)
-                      '("-arch" "x86_64")
+                      #+(and (or x86 ppc) linux) '("-m32")
+                      #+(and x86-64 darwin inode64)
+                      '("-arch" "x86_64"
+                        "-mmacosx-version-min=10.5"
+                        "-D_DARWIN_USE_64_BIT_INODE")
+                      #+(and x86-64 darwin (not inode64))
+                      '("-arch" "x86_64"
+                        "-mmacosx-version-min=10.4")
+                      #+(and x86 darwin)
+                      '("-arch" "i386"
+                        "-mmacosx-version-min=10.4")
+                      #+(and x86-64 sunos) '("-m64")
                       (list "-o"
                             (namestring tmp-a-dot-out)
                             (namestring tmp-c-source)))