Fixed recent enhancement to compile-file.
authorMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 25 Apr 2011 20:00:09 +0000 (13:00 -0700)
committerMatt Birkholz <matt@birkholz.chandler.az.us>
Mon, 25 Apr 2011 20:00:09 +0000 (13:00 -0700)
src/compiler/base/toplev.scm

index 358375fba41581f0b93152a1900ea9be9bb775b1..4263addfa862cd43c683fd7aae76895c35de5536 100644 (file)
@@ -37,7 +37,8 @@ USA.
 (define compile-file)
 (let ((scm-pathname (lambda (path) (pathname-new-type path "scm")))
       (bin-pathname (lambda (path) (pathname-new-type path "bin")))
-      (ext-pathname (lambda (path) (pathname-new-type path "ext")))
+      (ext-pathname (lambda (path) (pathname-default-type path "ext")))
+      (ext-pathname? (lambda (path) (equal? (pathname-type path) "ext")))
       (com-pathname
        (lambda (path)
         (pathname-new-type path (compiler:compiled-code-pathname-type)))))
@@ -94,9 +95,7 @@ USA.
                           `((USUAL-INTEGRATIONS
                              ,@compile-file:override-usual-integrations)
                             ,@(let ((deps (keep-matching-items
-                                           dependencies
-                                           (lambda (item)
-                                             (eq? #f (pathname-type item))))))
+                                           dependencies ext-pathname?)))
                                 (if (null? deps)
                                     '()
                                     `((INTEGRATE-EXTERNAL ,@deps)))))))