nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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).
This commit is contained in:
Ludovic Courtès 2017-05-02 15:10:05 +02:00
parent 8a2105078b
commit 693f12ce23
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -379,7 +379,7 @@ check-local:
endif !CAN_RUN_TESTS endif !CAN_RUN_TESTS
check-system: $(GOBJECTS) check-system: $(GOBJECTS) $(BOOTSTRAP_GUILE_TARBALLS)
$(AM_V_at)$(top_builddir)/pre-inst-env \ $(AM_V_at)$(top_builddir)/pre-inst-env \
$(GUILE) --no-auto-compile \ $(GUILE) --no-auto-compile \
-e '(@@ (run-system-tests) run-system-tests)' \ -e '(@@ (run-system-tests) run-system-tests)' \

6
gnu/local.mk
View File

@ -1087,13 +1087,15 @@ nodist_bootstrap_mips64el_linux_DATA = \
set-bootstrap-executable-permissions: set-bootstrap-executable-permissions:
chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
DISTCLEANFILES = \ BOOTSTRAP_GUILE_TARBALLS = \
$(nodist_bootstrap_x86_64_linux_DATA) \ $(nodist_bootstrap_x86_64_linux_DATA) \
$(nodist_bootstrap_i686_linux_DATA) \ $(nodist_bootstrap_i686_linux_DATA) \
$(nodist_bootstrap_armhf_linux_DATA) \ $(nodist_bootstrap_armhf_linux_DATA) \
$(nodist_bootstrap_aarch64_linux_DATA) \ $(nodist_bootstrap_aarch64_linux_DATA) \
$(nodist_bootstrap_mips64el_linux_DATA) $(nodist_bootstrap_mips64el_linux_DATA)
DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)
# Method to download a file from an external source. # Method to download a file from an external source.
DOWNLOAD_FILE = \ DOWNLOAD_FILE = \
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \