>From 725f9975b3b99d31db33f7c277ffbf1f4d40e675 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 13 Mar 2023 18:39:14 -0400 Subject: [PATCH 1/3] Look for compiled guile files in the appropriate spot. * scripts/glean.in (config-lookup): Add guileobjectdir and adjust regex appropriately to handle "exec_prefix". (maybe-augment-load-paths!): Add guileobjectdir to %load-compiled-path instead of guilemoduledir. --- scripts/glean.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/glean.in b/scripts/glean.in index 22fb37e..9639c23 100644 --- a/scripts/glean.in +++ b/scripts/glean.in @@ -46,10 +46,12 @@ (define config-lookup (let ((config '(("prefix" . "@prefix@") + ("exec_prefix" . "@exec_prefix@") ("datarootdir" . "@datarootdir@") ("guilemoduledir" . "@guilemoduledir@") + ("guileobjectdir" . "@guileobjectdir@") ("localedir" . "@localedir@"))) - (var-ref-regexp (make-regexp "\\$\\{([a-z]+)\\}"))) + (var-ref-regexp (make-regexp "\\$\\{([a-z_]+)\\}"))) (define (expand-var-ref match) (lookup (match:substring match 1))) (define (expand str) @@ -62,9 +64,10 @@ (define (maybe-augment-load-paths!) (unless (getenv "GLEAN_UNINSTALLED") (setenv "CORE_ROOT" (config-lookup "guilemoduledir")) - (let ((module-dir (config-lookup "guilemoduledir"))) + (let ((module-dir (config-lookup "guilemoduledir")) + (object-dir (config-lookup "guileobjectdir"))) (push! module-dir %load-path) - (push! module-dir %load-compiled-path)))) + (push! object-dir %load-compiled-path)))) (define (run-glean-main) (let ((glean-main (module-ref (resolve-interface '(glean boot)) -- 2.39.2