Skip to content
Snippets Groups Projects
Commit d2991b32 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Avoid name clash in FASLs for different implementations.

Fix ECL compilation workaround.
parent f23d0d05
No related branches found
No related tags found
No related merge requests found
...@@ -20,17 +20,15 @@ ...@@ -20,17 +20,15 @@
(compile-file *asdf-lisp* :output-file tmp)) (compile-file *asdf-lisp* :output-file tmp))
(declare (ignore result)) (declare (ignore result))
(cond (cond
#-ecl
(warnings-p (warnings-p
;;; ECL gives warnings that it shouldn't!
#+ecl (leave-lisp "ASDF compiled with warnings. Please fix ECL." 0)
#-ecl
(leave-lisp "Testsuite failed: ASDF compiled with warnings" 1)) (leave-lisp "Testsuite failed: ASDF compiled with warnings" 1))
(errors-p (errors-p
(leave-lisp "Testsuite failed: ASDF compiled with ERRORS" 2)) (leave-lisp "Testsuite failed: ASDF compiled with ERRORS" 2))
(t (t
#+clisp ;; But for a bug in CLISP 2.48, we should use :if-exists :overwrite and be atomic #+ecl
(posix:copy-file tmp *asdf-fasl* :method :rename) (when warnings-p
#-clisp (format t "~&ASDF compiled with warnings. Please fix ECL.~%"))
(rename-file tmp *asdf-fasl* (ignore-errors (delete-file *asdf-fasl*))
#+clozure :if-exists #+clozure :rename-and-delete) (rename-file tmp *asdf-fasl*)
(leave-lisp "ASDF compiled cleanly" 0))))))) (leave-lisp "ASDF compiled cleanly" 0)))))))
...@@ -11,8 +11,23 @@ ...@@ -11,8 +11,23 @@
(defvar *asdf-fasl* (defvar *asdf-fasl*
(compile-file-pathname (compile-file-pathname
(merge-pathnames (merge-pathnames
(make-pathname :directory '(:relative "tmp") :defaults *asdf-lisp*) (make-pathname :directory '(:relative "tmp")
:name (format nil "asdf-~(~A~)"
(or #+allegro (format nil "~Alisp" excl:*current-case-mode*)
#+armedbear :abcl
#+clisp :clisp
#+clozure :ccl
#+cmu :cmucl
#+corman :cormanlisp
#+digitool :mcl
#+ecl :ecl
#+gcl :gcl
#+lispworks :lispworks
#+sbcl :sbcl
#+scl scl))
:defaults *asdf-lisp*)
*asdf-lisp*))) *asdf-lisp*)))
(defun load-asdf () (defun load-asdf ()
(load *asdf-fasl*)) (load *asdf-fasl*))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment