amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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 <ludo@gnu.org>
This commit is contained in:
Sergey Trofimov 2023-11-05 19:31:03 +01:00 • committed by Ludovic Courtès
parent 70a14b27b5
commit 7fef609df1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -48,7 +48,7 @@ do_subst = $(SED) \
-e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \ -e 's,[@]abs_top_builddir[@],$(abs_top_builddir),g' \
-e 's,[@]localedir[@],$(localedir),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)rm -f $@ $@-t
$(AM_V_at)$(MKDIR_P) "$(@D)" $(AM_V_at)$(MKDIR_P) "$(@D)"
$(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t" $(AM_V_GEN)$(do_subst) < "$(srcdir)/$@.in" > "$@-t"

6
build-aux/pre-inst-env.in
View file

@ -46,6 +46,12 @@ export PATH
GUIX="$abs_top_builddir/scripts/guix" GUIX="$abs_top_builddir/scripts/guix"
export 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 # Define $GUIX_UNINSTALLED to prevent `guix' from
# prepending @guilemoduledir@ to the Guile load paths. # prepending @guilemoduledir@ to the Guile load paths.