Fix `cond-expand' inside `define-library'.

(cherry picked from commit 8866f0e134d80474e67f69bd5c432eeb5b74e0e1)

diff --git a/src/runtime/library-parser.scm b/src/runtime/library-parser.scm
index 11f850baa112eb545c43a67dcb5de87f1d433a16..b9d4f0f0b1ab9ffc5476ca2a0eb247bd7a2fc7ea 100644 (file)
--- a/src/runtime/library-parser.scm
+++ b/src/runtime/library-parser.scm
@@ -172,7 +172,15 @@ USA.
                               (cdr parsed-decl)))
                  ((cond-expand)
                   (expand-parsed-decls
-                   (evaluate-cond-expand eq? parsed-decl)))
+                   (evaluate-cond-expand
+                    eq?
+                    (filter (lambda (clause) (not (eq? 'else (car clause))))
+                            (cdr parsed-decl))
+                    (cond ((find (lambda (clause) (eq? 'else (car clause)))
+                                 (cdr parsed-decl))
+                           => cdr)
+                          (else '())))
+                   directory))
                  ((include include-ci)
                   (list
                    (cons (car parsed-decl)