plugin: fix "different compilation instance" error on plugin load
ober
4f8084f3ebb465d63ccf4091c3b3590b380d2988
--- a/build-binary.ss +++ b/build-binary.ss @@ -265,20 +265,41 @@ (map (lambda (m) (format "~a/~a.so" jerboa-lib-dir m)) '("jerboa/core" "jerboa/runtime" + "jerboa/ffi" "jerboa/prelude" "std/error" "std/format" "std/sort" + "std/pmap" + "std/pset" + "std/pvec" "std/pregexp" + "std/srfi/srfi-115" + "std/regex" + "std/rx" "std/sugar" "std/typed" + "std/match2" + "std/iter" + "std/result" + "std/datetime" + "std/csv" + "std/ergo" "std/misc/string" "std/misc/list" "std/misc/alist" + "std/misc/func" "std/misc/thread" "std/misc/ports" "std/misc/retry" "std/misc/uuid" + "std/misc/atom" + "std/misc/meta" + "std/misc/shared" + "std/concur/hash" + "std/misc/nested" + "std/debug/pp" + "std/os/platform" "std/os/path" "std/os/shell" "std/text/json" --- a/src/jcode/core/plugin.ss +++ b/src/jcode/core/plugin.ss @@ -37,20 +37,9 @@ (if (list? entries) entries '()))))) dirs)))) -(def (ensure-library-dirs!) - "Ensure library-directories includes Jerboa lib dir for plugin imports." - (let ((jerboa-lib (path-join (or (getenv "JERBOA_HOME") - (path-join (getenv "HOME") "mine/jerboa")) - "lib"))) - (when (file-directory? jerboa-lib) - (let ((entry (cons jerboa-lib jerboa-lib))) - (unless (member entry (library-directories)) - (library-directories (cons entry (library-directories)))))))) - (def (load-plugin path) "Load a single plugin file." (log-info logger "loading" `((path . ,path))) - (ensure-library-dirs!) (try (load path) (set! *loaded-plugins* (cons path *loaded-plugins*))