build: Require scripts/guix in pre-inst-env.

7fef609d · Sergey Trofimov <[email protected]> · 2023-11-05 19:31:03 +01:00

* Makefile.am: Make scripts/guix depend on local guile.
* build-aux/pre-inst-env.in: Require scripts/guix.

Change-Id: Ib248da80a1e8215c4c5e6c485ade41a893ac0fd5
Signed-off-by: Ludovic Courtès <[email protected]>

Commit: 7fef609df1a61898764623f5cd4d4a930e5f19ea
Parents: 70a14b27

Changes

2 files changed · +7 −1

File	Status	Add	Del	Content
Makefile.am	modified	+1	−1	View file
build-aux/pre-inst-env.in	modified	+6	−0	View file

Makefile.am

View file

diff --git a/Makefile.am b/Makefile.am
index f4155f0..595a7c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ do_subst = $(SED)					\
   -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g'	\
   -e 's,[@]localedir[@],$(localedir),g'
 
-scripts/guix: scripts/guix.in Makefile
+scripts/guix: scripts/guix.in Makefile guile$(EXEEXT)
 	$(AM_V_at)rm -f $@ $@-t
 	$(AM_V_at)$(MKDIR_P) "$(@D)"
 	$(AM_V_GEN)$(do_subst) < "$(srcdir)/[email protected]" > "$@-t"

build-aux/pre-inst-env.in

View file

diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index cd90a06..c18d372 100644
--- a/build-aux/pre-inst-env.in
+++ b/build-aux/pre-inst-env.in
@@ -46,6 +46,12 @@ export PATH
 GUIX="$abs_top_builddir/scripts/guix"
 export GUIX
 
+# Sanity check.
+if [ "$1" = "guix" ] && [ ! -f "$GUIX" ]; then
+    echo "$GUIX is not built.  Please run 'make scripts/guix'."
+    exit 1
+fi
+
 # Define $GUIX_UNINSTALLED to prevent `guix' from
 # prepending @guilemoduledir@ to the Guile load paths.
 