[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#66958] [PATCH v1] build: Require scripts/guix in pre-inst-env.
From: |
Sergey Trofimov |
Subject: |
[bug#66958] [PATCH v1] build: Require scripts/guix in pre-inst-env. |
Date: |
Sun, 19 Nov 2023 14:34:10 +0100 |
* Makefile.am: Make scripts/guix depend on local guile.
* build-aux/pre-inst-env.in: Require scripts/guix.
---
Makefile.am | 2 +-
build-aux/pre-inst-env.in | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index cbc3191dfc..34574c3a0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,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)/$@.in" > "$@-t"
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
index cd90a06cbc..7c1d5aa09b 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 [ ! -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.
base-commit: 761810d32a0550912b5bb36a0c9f60141bcb7d20
--
2.41.0