X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/8098424c48e57f19d22d04304a1cce80979e0da4..0eed49b9928afe798185a6294b3bd975c79d0c56:/tools/asdf-extensions.lisp

diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp
index f533a64..b48dd08 100644
--- a/tools/asdf-extensions.lisp
+++ b/tools/asdf-extensions.lisp
@@ -3,7 +3,7 @@ (in-package :asdf)
 (export '*dso-extension*)
 
 (defparameter *dso-extension* 
- #-(and darwin win32)"so" #+darwin"dylib" #+win32"dll")
+ #-(or darwin win32)"so" #+darwin"dylib" #+win32"dll")
 
 
 ;;; The following code is more or less copied frm sb-bsd-sockets.asd,
@@ -36,8 +36,8 @@ (defmethod perform :after ((operation compile-op) (dso unix-dso))
 			     (output-files operation c))
 		  (module-components dso)))))
     (unless (zerop
-	     (run-shell-command "gcc ~A~{ ~A~} -o ~S~{ ~S~}"
-	      #-(and darwin win32)"-shared"
+	     (run-shell-command "gcc ~A -o ~S ~{~S~^ ~} ~{~A~^ ~}"
+	      #-(or darwin win32)"-shared"
 	      #+darwin "-bundle"
 	      #+win32
 	      (format nil "-shared -Wl,--out-implib,~S"
@@ -46,9 +46,9 @@ (defmethod perform :after ((operation compile-op) (dso unix-dso))
 		 :type "a" 
 		 :name (format nil "lib~Adll" (pathname-name output))
 		 :defaults output)))
-	      (slot-value dso 'ldflags)
 	      (unix-name output)
-	      inputs))
+	      inputs
+	      (slot-value dso 'ldflags)))
       (error 'operation-error :operation operation :component dso))))
 
 #+clisp