0.8.3.28:

[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 c0eb896..9fa49e5 100644 (file)
--- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@ -30,7 +30,8 @@
     (unless (zerop
             (run-shell-command
              #+sunos "gcc -shared -lresolv -lsocket -lnsl -o ~S ~{~S ~}"
-             #-sunos "gcc -shared -o ~S ~{~S ~} "
+             #+darwin "gcc -bundle -o ~S ~{~S ~}"
+             #-(or darwin sunos) "gcc -shared -o ~S ~{~S ~} "
              dso-name
              (mapcar #'unix-name
                      (mapcan (lambda (c)
@@ -62,7 +63,7 @@
 
 (defsystem sb-bsd-sockets
     :version "0.58"
-    :depends-on (sb-rt sb-grovel)
+    :depends-on (sb-grovel)
     :components ((:file "defpackage")
                 (:file "split" :depends-on ("defpackage"))
                  (:file "array-data" :depends-on ("defpackage"))
@@ -85,7 +86,6 @@
                 (:file "misc" :depends-on ("sockets" "constants"))
 
                 (:file "def-to-lisp")
-                (:file "tests" :depends-on ("inet" "sockopt"))
 
                 (:static-file "NEWS")
                 ;; (:static-file "INSTALL")
@@ -94,7 +94,17 @@
                 (:static-file "doc" :pathname "doc.lisp")
                 (:static-file "TODO")))
 
+(defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
+  (provide 'sb-bsd-sockets))
+
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
+  (operate 'load-op 'sb-bsd-sockets-tests)
+  (operate 'test-op 'sb-bsd-sockets-tests))
+
+(defsystem sb-bsd-sockets-tests
+  :depends-on (sb-rt sb-bsd-sockets)
+  :components ((:file "tests")))
+
+(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
   (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
       (error "test-op failed")))
-