Skip to content
Snippets Groups Projects
Commit 6005bd07 authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

build: Make sure the installed 'config.go' is newer than 'config.scm'.

Fixes <http://bugs.gnu.org/19317>.
Reported by rekado <rekado@elephly.net>.

* gnu-system.am (install-data-hook): Rename to...
  (set-bootstrap-executable-permissions): ... this.
* Makefile.am (install-data-hook): New target.
parent 9f6f1aac
No related branches found
No related tags found
No related merge requests found
...@@ -282,6 +282,13 @@ SUFFIXES = .go ...@@ -282,6 +282,13 @@ SUFFIXES = .go
guix_install_go_files = install-nobase_nodist_guilemoduleDATA guix_install_go_files = install-nobase_nodist_guilemoduleDATA
$(guix_install_go_files): install-nobase_dist_guilemoduleDATA $(guix_install_go_files): install-nobase_dist_guilemoduleDATA
# The above trick doesn't work for 'config.go' because both 'config.scm' and
# 'config.go' are listed in $(nobase_nodist_guilemodule_DATA). Thus, give it
# special treatment.
install-data-hook: set-bootstrap-executable-permissions
touch "$(DESTDIR)$(guilemoduledir)/guix/config.go"
SUBDIRS = po/guix po/packages SUBDIRS = po/guix po/packages
BUILT_SOURCES = BUILT_SOURCES =
......
...@@ -484,7 +484,7 @@ nodist_bootstrap_mips64el_linux_DATA = \ ...@@ -484,7 +484,7 @@ nodist_bootstrap_mips64el_linux_DATA = \
# Those files must remain executable, so they remain executable once # Those files must remain executable, so they remain executable once
# imported into the store. # imported into the store.
install-data-hook: set-bootstrap-executable-permissions:
chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz} chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
DISTCLEANFILES = \ DISTCLEANFILES = \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment