~ruther/guix-local

693f12ce2326f82020e90e58e69cf2b54808c19b — Ludovic Courtès 8 years ago 8a21050
build: 'check-system' now depends on the bootstrap Guile tarballs.

Reported by Chris Marusich <cmmarusich@gmail.com>.

* gnu/local.mk (BOOTSTRAP_GUILE_TARBALLS): New variable.
(DISTCLEANFILES): Define as an alias for 'BOOTSTRAP_GUILE_TARBALLS'.
* Makefile.am (check-system): Depend on $(BOOTSTRAP_GUILE_TARBALLS).
2 files changed, 5 insertions(+), 3 deletions(-)

M Makefile.am
M gnu/local.mk
M Makefile.am => Makefile.am +1 -1
@@ 379,7 379,7 @@ check-local:

endif !CAN_RUN_TESTS

check-system: $(GOBJECTS)
check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
	$(AM_V_at)$(top_builddir)/pre-inst-env			\
	   $(GUILE) --no-auto-compile				\
	   -e '(@@ (run-system-tests) run-system-tests)'	\

M gnu/local.mk => gnu/local.mk +4 -2
@@ 1087,13 1087,15 @@ nodist_bootstrap_mips64el_linux_DATA =					\
set-bootstrap-executable-permissions:
	chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}

DISTCLEANFILES =				\
BOOTSTRAP_GUILE_TARBALLS =			\
  $(nodist_bootstrap_x86_64_linux_DATA)		\
  $(nodist_bootstrap_i686_linux_DATA)		\
  $(nodist_bootstrap_armhf_linux_DATA)		\
  $(nodist_bootstrap_aarch64_linux_DATA)		\
  $(nodist_bootstrap_aarch64_linux_DATA)	\
  $(nodist_bootstrap_mips64el_linux_DATA)

DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)

# Method to download a file from an external source.
DOWNLOAD_FILE =								\
  GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"	\