01/02: build: 'check-system' now depends on the bootstrap Guile tarballs.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 693f12ce2326f82020e90e58e69cf2b54808c19b
Author: Ludovic Courtès <address@hidden>
Date:   Tue May 2 15:10:05 2017 +0200

    build: 'check-system' now depends on the bootstrap Guile tarballs.
    
    Reported by Chris Marusich <address@hidden>.
    
    * 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).
---
 Makefile.am  | 2 +-
 gnu/local.mk | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9484ba7..c75be9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)'        \
diff --git a/gnu/local.mk b/gnu/local.mk
index 52000a2..28ab73a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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"        
\