0.8.12.38:

[sbcl.git] / contrib / sb-bsd-sockets / sb-bsd-sockets.asd

diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
index 6056a5a..5efe694 100644 (file)
--- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@ -30,11 +30,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)
@@ -51,9 +52,10 @@
 (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)))
@@ -65,7 +67,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-bsd-sockets
     :version "0.58"
@@ -74,18 +76,16 @@
     #+sb-building-contrib "SYS:CONTRIB;SB-BSD-SOCKETS;"
     :components ((:file "defpackage")
                 (:file "split" :depends-on ("defpackage"))
-                 (:file "array-data" :depends-on ("defpackage"))
                 (:unix-dso "alien"
                            :components ((:c-source-file "undefs")
                                         (:c-source-file "get-h-errno")))
                 (:file "malloc" :depends-on ("defpackage"))
-                (:file "foreign-glue" :depends-on ("defpackage" "malloc"))
                 (sb-grovel:grovel-constants-file
                  "constants"
                  :package :sockint
-                 :depends-on  ("def-to-lisp" "defpackage" "foreign-glue"))
+                 :depends-on  ("defpackage"))
                 (:file "sockets"
-                       :depends-on ("constants" "array-data"))
+                       :depends-on ("constants"))
                 
                 (:file "sockopt" :depends-on ("sockets"))
                 (:file "inet" :depends-on ("sockets" "split"  "constants" ))
@@ -93,8 +93,6 @@
                 (:file "name-service" :depends-on ("sockets" "constants" "alien"))
                 (:file "misc" :depends-on ("sockets" "constants"))
 
-                (:file "def-to-lisp")
-
                 (:static-file "NEWS")
                 ;; (:static-file "INSTALL")
                 (:static-file "README")