civodul pushed a commit to branch master in repository shepherd. commit 20a3e455f65a1eb84a45eb78ee25df6ad89b4e89 Author: Ludovic Courtès <l...@gnu.org> Date: Wed Jan 27 22:04:13 2016 +0100
build: Unset 'GUILE_LOAD_COMPILED_PATH' while building. * Makefile.am (%.go): Unset GUILE_LOAD_COMPILED_PATH. --- Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index dcffcea..cf9a691 100644 --- a/Makefile.am +++ b/Makefile.am @@ -157,12 +157,14 @@ AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY)) AM_V_GUILEC_0 = @echo " GUILEC " $@; # Make sure 'modules/shepherd/{config,system.scm}' are built first. +# Unset 'GUILE_LOAD_COMPILED_PATH' so we can be sure that any .go file that we +# load comes from the build directory. # XXX: Use the C locale for when Guile lacks # <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>. %.go: %.scm $(templates:%.in=%) $(AM_V_GUILEC)$(MKDIR_P) "`dirname "$@"`" ; \ $(AM_V_P) && out=1 || out=- ; \ - LC_ALL=C \ + unset GUILE_LOAD_COMPILED_PATH ; LC_ALL=C \ $(GUILD) compile --target="$(host)" \ -L "$(top_builddir)/modules" \ -L "$(top_srcdir)/modules" \