summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès2015-03-11 11:08:57 +0100
committerLudovic Courtès2015-03-11 11:08:57 +0100
commit4425f9d10eeac36191f281dfd94f342bf7e2b15f (patch)
tree6aa373019d8da0be074df22e095f2f7d78488301
parent37f280c58cef61587a23c1bf636b468d19b6d1c5 (diff)
downloadskribilo-4425f9d10eeac36191f281dfd94f342bf7e2b15f.tar.gz
skribilo-4425f9d10eeac36191f281dfd94f342bf7e2b15f.tar.lz
skribilo-4425f9d10eeac36191f281dfd94f342bf7e2b15f.zip
build: Override 'GUILE_LOAD_COMPILED_PATH' entirely while building.
* guilec.am (.scm.go): Override GUILE_LOAD_COMPILED_PATH.
-rw-r--r--guilec.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/guilec.am b/guilec.am
index efa00c7..dc6e870 100644
--- a/guilec.am
+++ b/guilec.am
@@ -18,10 +18,14 @@ AM_V_GUILEC = $(AM_V_GUILEC_$(V))
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
AM_V_GUILEC_0 = @echo " GUILEC" $@;
+# Override $GUILE_LOAD_COMPILED_PATH altogether so we don't end up
+# loading .go files from $(moduledir) coming from a previous
+# installation (they could be more recent than the local .scm files if
+# the user run 'make install' recently.)
.scm.go:
$(AM_V_GUILEC)$(MKDIR_P) `dirname $@` ; \
GUILE_AUTO_COMPILE=0 \
- GUILE_LOAD_COMPILED_PATH="$(builddir):$(top_builddir)/src/guile:$$GUILE_LOAD_COMPILED_PATH" \
+ GUILE_LOAD_COMPILED_PATH="$(builddir):$(top_builddir)/src/guile" \
$(GUILE) -L "$(srcdir)" -L "$(top_srcdir)/src/guile" \
-L "$(top_builddir)/src/guile" \
-c "(use-modules (system base compile) \