In aliencomp.c #+(and ppc darwin) should be #!+(and ppc darwin), which

[sbcl.git] / contrib / sb-posix / sb-posix.asd

diff --git a/contrib/sb-posix/sb-posix.asd b/contrib/sb-posix/sb-posix.asd
index 3fd109a..b3fd54d 100644 (file)
--- a/contrib/sb-posix/sb-posix.asd
+++ b/contrib/sb-posix/sb-posix.asd
@@ -1,5 +1,6 @@
 ;;; -*-  Lisp -*-
-(require :sb-grovel)
+(cl:eval-when (:compile-toplevel :load-toplevel :execute)
+  (asdf:oos 'asdf:load-op :sb-grovel))
 (defpackage #:sb-posix-system (:use #:asdf #:cl #:sb-grovel))
 (in-package #:sb-posix-system)
 
@@ -33,11 +34,12 @@
     (unless (zerop
             (run-shell-command
              "gcc ~A -o ~S ~{~S ~}"
-             (if (sb-ext:posix-getenv "LDFLAGS")
-                 (sb-ext:posix-getenv "LDFLAGS")
-               #+sunos "-shared -lresolv -lsocket -lnsl"
-               #+darwin "-bundle"
-               #-(or darwin sunos) "-shared")
+             (concatenate 'string
+                          (sb-ext:posix-getenv "EXTRA_LDFLAGS")
+                          " "
+                          #+sunos "-shared -lresolv -lsocket -lnsl"
+                          #+darwin "-bundle"
+                          #-(or darwin sunos) "-shared")
              dso-name
              (mapcar #'unix-name
                      (mapcan (lambda (c)
@@ -54,9 +56,11 @@
 (defmethod perform ((op compile-op) (c c-source-file))
   (unless
       (= 0 (run-shell-command "gcc ~A -o ~S -c ~S"
-                             (if (sb-ext:posix-getenv "CFLAGS")
-                                 (sb-ext:posix-getenv "CFLAGS")
-                               "-fPIC")
+                             (concatenate
+                              'string
+                              (sb-ext:posix-getenv "EXTRA_CFLAGS")
+                              " "
+                              "-fPIC")
                              (unix-name (car (output-files op c)))
                              (unix-name (component-pathname c))))
     (error 'operation-error :operation op :component c)))
@@ -68,8 +72,7 @@
   (let ((co (make-instance 'compile-op)))
     (let ((filename (car (output-files co c))))
       #+cmu (ext:load-foreign filename)
-      #+sbcl (sb-alien:load-1-foreign filename))))
-
+      #+sbcl (sb-alien:load-shared-object filename))))
 
 (defsystem sb-posix
     :depends-on (sb-grovel)
@@ -78,7 +81,8 @@
     :components ((:file "defpackage")
                 (:file "designator" :depends-on ("defpackage"))
                  (:unix-dso "alien"
-                           :components ((:c-source-file "stat-macros")))
+                           :components ((:c-source-file "stat-macros")
+                                        (:c-source-file "waitpid-macros")))
                 (:file "macros" :depends-on ("designator"))
                 (sb-grovel:grovel-constants-file
                  "constants"