Commit 7e361dc2 authored by Elias Pipping's avatar Elias Pipping Committed by Robert Goldman
Browse files

Clean up use of *features*

In particular:
 - clasp does not define :ecl
 - use :os-unix instead of :unix
 - use :os-windows instead of :mswindows or :windows
 - use :os-macosx instead of :darwin
 - use :lispworks7+ instead of :lispworks7
parent ae732541
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
(with-upgradability ()
  ;; Hook into CL:REQUIRE.
  #-clisp (pushnew 'module-provide-asdf *module-provider-functions*)
  #+clisp (if-let (x (and #+clisp (find-symbol* '#:*module-provider-functions* :custom nil)))
  #+clisp (if-let (x (find-symbol* '#:*module-provider-functions* :custom nil))
            (eval `(pushnew 'module-provide-asdf ,x)))

  #+(or clasp ecl mkcl)
+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@
                                          :direction :output
                                          :if-exists :supersede :if-does-not-exist :create)
             (setup-asdftest-logical-host :root root)
             #+(and asdf-test-logical-pathname)
             #+asdf-test-logical-pathname
             (assert-pathname-equal
              (make-pathname :host "ASDFTEST" :directory '(:absolute "system2" "module4")
                             :name nil :type nil)
+1 −1
Original line number Diff line number Diff line
(defpackage :test-asdf/dll-test (:use)) ;; dummy, for package-inferred-system dependencies.

#+(and ecl (not clasp))
#+ecl
(ffi:clines "
extern int sample_function();

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@

(in-package :test-package)

#+(and mkcl windows)
#+(and mkcl os-windows)
(ffi:clines "extern __declspec(dllimport) int sample_function(void);")
#-(and mkcl windows)
#-(and mkcl os-windows)
(ffi:clines "extern int sample_function(void);")

(ffi:def-function "sample_function" () :returning :int)
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
     :components ((:file "hello"))
     #+mkcl
     ,@`(;;:prefix-lisp-object-files (,(namestring (truename (translate-logical-pathname #P"SYS:cmp.a"))))
         :extra-build-args ,(or #-windows '(:use-mkcl-shared-libraries nil))
         :extra-build-args ,(or #-os-windows '(:use-mkcl-shared-libraries nil))
         :class program-system
         :epilogue-code (progn
                          (setq uiop/image:*image-dumped-p* :executable)
Loading