Small fix necessary for win32

[clg] / tools / asdf-extensions.lisp

diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp
index f533a6449c36ff2243a74e11abeb1aa6eac28729..b48dd086d1eed007f27d0e315d58099d7710c32f 100644 (file)
--- 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