diff options
| author | Alex Kost <alezost@gmail.com> | 2017-05-05 14:38:24 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2017-05-05 14:40:20 +0300 |
| commit | 854285087d97ff9e3e4a27af36778ae2e232f341 (patch) | |
| tree | 642283cbf59847bf24f14ef40698d311fbaa94a4 | |
| parent | build: Rearrange some guile modules (diff) | |
| download | guix-wigust-854285087d97ff9e3e4a27af36778ae2e232f341.tar.gz | |
build: Do not unset Guile load paths
* scheme/Makefile.am: Always leave GUILE_LOAD_[COMPILED_]PATH during
compilation.
| -rw-r--r-- | scheme/Makefile.am | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/scheme/Makefile.am b/scheme/Makefile.am index 523c1df..3e1550e 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -58,15 +58,21 @@ GUILEC_OPTS = \ -Wunbound-variable if GUIX_DIR - GUILEC_ENV += \ - GUILE_LOAD_PATH="$(abs_srcdir):$(guixmoduledir)" \ - GUILE_LOAD_COMPILED_PATH="$(abs_builddir):$(guixccachedir)" + guix_module_part=":$(guixmoduledir)" + guix_ccache_part=":$(guixccachedir)" else - GUILEC_ENV += \ - GUILE_LOAD_PATH="$(abs_srcdir):$$GUILE_LOAD_PATH" \ - GUILE_LOAD_COMPILED_PATH="$(abs_builddir):$$GUILE_LOAD_COMPILED_PATH" + guix_module_part= + guix_ccache_part= endif +# Guile PATHs shouldn't be unset: some guix modules want to load +# (gnutls) module, that's why 'guix' package propagates 'gnutls', i.e. +# a directory with gnutls module is placed in GUILE_LOAD_PATH. + +GUILEC_ENV += \ + GUILE_LOAD_PATH="$(abs_srcdir)$(guix_module_part):$$GUILE_LOAD_PATH" \ + GUILE_LOAD_COMPILED_PATH="$(abs_builddir)$(guix_ccache_part):$$GUILE_LOAD_COMPILED_PATH" + $(GO_FILES): %.go: %.scm -$(AM_V_GUILEC) $(GUILEC_ENV) \ $(GUILD) compile $(GUILEC_OPTS) --output=$@ $< |