fix loadpath

mighty-gerbils · Oct 15, 2023 · 2d096f5 · 2d096f5
1 parent a8335c5
commit 2d096f5
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/src/gerbil/runtime/init.ss b/src/gerbil/runtime/init.ss
@@ -243,19 +243,21 @@ namespace: #f
     ;; initialize the load path
     (let* ((home (gerbil-home))
            (libdir (path-expand "lib" home))
-           (loadpath
-            (cond
-             ((getenv "GERBIL_LOADPATH" #f)
-              => (lambda (envvar)
-                   (filter (lambda (x) (not (string-empty? x)))
-                           (string-split envvar #\:))))
-             (else '())))
            (userpath
             (path-expand "lib" (gerbil-path)))
            (loadpath
             (if (getenv "GERBIL_BUILD_PREFIX" #f)
-              (cons loadpath libdir)
-              (cons* loadpath userpath libdir))))
+              [libdir]
+              [userpath libdir]))
+           (loadpath
+            (cond
+             ((getenv "GERBIL_LOADPATH" #f)
+              => (lambda (envvar)
+                   (append
+                    (filter (lambda (x) (not (string-empty? x)))
+                            (string-split envvar #\:))
+                    loadpath)))
+             (else loadpath))))
       (current-module-library-path loadpath))
 
     ;; initialize the modue registry