diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-08-04 08:16:38 -0400 |
| commit | 0832787e5c463c713d8f24fdec0f52900ff1c2bd (patch) | |
| tree | 5ce20bef711d0d85a22cd041758278d7c176b0f3 /Makefile.am | |
| parent | 5b098cc4b937c05d6f685772c66e2aa04490710a (diff) | |
| download | guix-patches-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar guix-patches-0832787e5c463c713d8f24fdec0f52900ff1c2bd.tar.gz | |
Revert "Merge branch 'core-updates'"
This reverts commit 455859a50f88f625d13fc2f304111f02369b366b.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 8bae85e144..d18e330797 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,6 @@ MODULES = \ guix/build/rpath.scm \ guix/build/cvs.scm \ guix/build/svn.scm \ - guix/build/syscalls.scm \ guix/build/gremlin.scm \ guix/build/emacs-utils.scm \ guix/build/graft.scm \ @@ -159,6 +158,13 @@ MODULES += \ endif +if BUILD_SYSCALLS_MODULE + +MODULES += \ + guix/build/syscalls.scm + +endif + if BUILD_DAEMON_OFFLOAD MODULES += \ @@ -379,6 +385,13 @@ EXTRA_DIST += \ endif !BUILD_DAEMON_OFFLOAD +if !BUILD_SYSCALLS_MODULE + +EXTRA_DIST += \ + guix/build/syscalls.scm + +endif !BUILD_SYSCALLS_MODULE + CLEANFILES = \ $(GOBJECTS) \ @@ -389,13 +402,11 @@ CLEANFILES = \ # there that are newer than the local .scm files (for instance because the # user ran 'make install' recently). When that happens, we end up loading # those previously-installed .go files, which may be stale, thereby breaking -# the whole thing. Likewise, set 'XDG_CACHE_HOME' to avoid loading possibly -# stale files from ~/.cache/guile/ccache. +# the whole thing. %.go: make-go ; @: make-go: $(MODULES) guix/config.scm guix/tests.scm $(AM_V_at)echo "Compiling Scheme modules..." ; \ unset GUILE_LOAD_COMPILED_PATH ; \ - XDG_CACHE_HOME=/nowhere \ host=$(host) srcdir="$(top_srcdir)" \ $(top_builddir)/pre-inst-env \ $(GUILE) -L "$(top_builddir)" -L "$(top_srcdir)" \ |