~ chicken-core (chicken-5) f55c138d9573dd6488eab2b4b8871a9da4771265
commit f55c138d9573dd6488eab2b4b8871a9da4771265 Author: Evan Hanson <evhan@foldling.org> AuthorDate: Fri Jan 1 17:17:11 2016 +1300 Commit: Evan Hanson <evhan@foldling.org> CommitDate: Fri Jan 1 17:21:25 2016 +1300 Remove import libraries from tracking list even when "-J" is used diff --git a/core.scm b/core.scm index f9707b36..ca37faa4 100644 --- a/core.scm +++ b/core.scm @@ -962,18 +962,17 @@ (print-error-message ex (current-error-port)) (exit 1)) (##sys#finalize-module (##sys#current-module))) - (cond ((or all-import-libraries - (assq name import-libraries) ) => - (lambda (il) - (when enable-module-registration - (emit-import-lib name il)) - ;; Remove from list - ;; to avoid error - (set! import-libraries - (delete il import-libraries)) - (values - (reverse xs) - '((##core#undefined))))) + (cond ((or (assq name import-libraries) all-import-libraries) + => (lambda (il) + (when enable-module-registration + (emit-import-lib name il)) + ;; Remove from list to avoid error + (when (pair? il) + (set! import-libraries + (delete il import-libraries))) + (values + (reverse xs) + '((##core#undefined))))) ((not enable-module-registration) (values (reverse xs)Trap