Commit bd7104cd authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Some cleanup of previous ECL changes.

parent bd28e685
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@
  :licence "MIT"
  :description "Another System Definition Facility"
  :long-description "ASDF builds Common Lisp software organized into defined systems."
  :version "2.017.3" ;; to be automatically updated by bin/bump-revision
  :version "2.017.4" ;; to be automatically updated by bin/bump-revision
  :depends-on ()
  :components
  ((:file "asdf")
+19 −25
Original line number Diff line number Diff line
;; -*- mode: common-lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.017.3: Another System Definition Facility.
;;; -*- mode: common-lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
;;; This is ASDF 2.017.4: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
@@ -112,7 +112,7 @@
         ;; "2.345.6" would be a development version in the official upstream
         ;; "2.345.0.7" would be your seventh local modification of official release 2.345
         ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
         (asdf-version "2.017.3")
         (asdf-version "2.017.4")
         (existing-asdf (find-class 'component nil))
         (existing-version *asdf-version*)
         (already-there (equal asdf-version existing-version)))
@@ -4121,10 +4121,14 @@ with a different configuration, so the configuration would be re-read then."
;;;
#+ecl
(progn
  (setf *compile-op-compile-file-function*
        (lambda (input-file &rest keys &key &allow-other-keys)
  (setf *compile-op-compile-file-function* 'ecl-compile-file)

  (defun use-ecl-byte-compiler-p ()
    (member :ecl-bytecmp *features*))

  (defun ecl-compile-file (input-file &rest keys &key &allow-other-keys)
    (if (use-ecl-byte-compiler-p)
              (apply 'compile-file input-file keys)
        (apply 'compile-file* input-file keys)
        (multiple-value-bind (object-file flags1 flags2)
            (apply 'compile-file* input-file :system-p t keys)
          (values (and object-file
@@ -4132,7 +4136,7 @@ with a different configuration, so the configuration would be re-read then."
                                      :lisp-files (list object-file))
                       object-file)
                  flags1
                        flags2)))))
                  flags2))))

  (defmethod output-files ((operation compile-op) (c cl-source-file))
    (declare (ignorable operation))
@@ -4148,16 +4152,6 @@ with a different configuration, so the configuration would be re-read then."
           :unless (string= (pathname-type i) "fas")
               :collect (compile-file-pathname (lispize-pathname i))))))

;;;---------------------------------------------------------------------------
;;; ECL logic for switching between conventional and byte compiling
;;;---------------------------------------------------------------------------
#+ecl
(defun use-ecl-byte-compiler-p ()
  (member :ecl-bytecmp *features*))
#-ecl
(defun use-ecl-byte-compiler-p ()
  nil)

;;;; -----------------------------------------------------------------
;;;; Hook into REQUIRE for ABCL, CLISP, ClozureCL, CMUCL, ECL and SBCL
;;;;