diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 21:44:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-10-17 23:25:25 +0200 |
| commit | ac5aa28889ac3a535f8cfdd71047c9aa10b1959d (patch) | |
| tree | 24498549369142b80528fa21b2d12629eb8432e6 /pre-inst-env.in | |
| parent | 9735a7b6eaccf248d91e1f3c17446b2fac41ec9a (diff) | |
| download | guix-patches-ac5aa28889ac3a535f8cfdd71047c9aa10b1959d.tar guix-patches-ac5aa28889ac3a535f8cfdd71047c9aa10b1959d.tar.gz | |
distro: Use our own pre-built Guile to bootstrap.
* distro/packages/base.scm (%bootstrap-guile): Build from a tarball
containing a pre-built Guile.
* distro.scm (%bootstrap-binaries-directory): New variable.
(search-bootstrap-binary): New procedure.
* Makefile.am (bootstrapdir, bootstrap_x86_64_linuxdir,
dist_bootstrap_x86_64_linux_DATA, DISTCLEANFILES, DOWNLOAD_FILE): New
variables.
(distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz):
New rule.
(EXTRA_DIST): Add `build-aux/download.scm'.
(.scm.go): Define the `DISTRO_BOOTSTRAP_DIRECTORY' and
`DISTRO_INSTALLED_BOOTSTRAP_DIRECTORY' environment variables.
* pre-inst-env.in: Define `DISTRO_BOOTSTRAP_DIRECTORY'.
* build-aux/download.scm: New file.
* distro/packages/bootstrap/x86_64-linux/{bash, mkdir, tar, xz}: New
files.
Diffstat (limited to 'pre-inst-env.in')
| -rw-r--r-- | pre-inst-env.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in index 3022ee5cff..7dcad5b967 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -24,10 +24,12 @@ # "./pre-inst-env guix-build hello". DISTRO_PATCH_DIRECTORY="@abs_top_srcdir@/distro/patches" +DISTRO_BOOTSTRAP_DIRECTORY="@abs_top_srcdir@/distro/packages/bootstrap" GUILE_LOAD_COMPILED_PATH="@abs_top_builddir@${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" GUILE_LOAD_PATH="@abs_top_srcdir@${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH" -export DISTRO_PATCH_DIRECTORY GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH +export DISTRO_PATCH_DIRECTORY DISTRO_BOOTSTRAP_DIRECTORY +export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH # Define $PATH so that `guix-build' and friends are easily found. |