diff options
| author | Andy Wingo <wingo@pobox.com> | 2016-01-29 10:21:44 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2016-01-29 10:21:44 +0100 |
| commit | eccdeb6cc6c164ea10160fafbd276b6dc5e9b73e (patch) | |
| tree | 2e31767aafb05352db514563b003fff9991c3dfa /meta/uninstalled-env.in | |
| parent | e4be4aea3491be954da25b8356e97c0fe60f98f9 (diff) | |
Distribute prebuilt bootstraps for common hosts
* am/bootstrap.am: New file, factored out of bootstrap/Makefile.am.
* bootstrap/Makefile.am: Use bootstrap.am.
* prebuilt/Makefile.am:
* prebuilt/i686-pc-linux-gnu/Makefile.am:
* prebuilt/mips-unknown-linux-gnu/Makefile.am:
* prebuilt/x86_64-unknown-linux-gnu/Makefile.am: New files.
* configure.ac: Output the prebuilt/ makefiles.
* Makefile.am: Descend into prebuilt/ when making dist.
* meta/uninstalled-env.in: Arrange to put prebuilt/ in the beginning of
the GUILE_LOAD_COMPILED_PATH. Also fix a case where bootstrap/ wasn't
being correctly added to the load path.
Diffstat (limited to 'meta/uninstalled-env.in')
| -rw-r--r-- | meta/uninstalled-env.in | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index 3bcde8eb9..7197eabee 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -80,21 +80,22 @@ then fi export GUILE_LOAD_PATH - if test "x$GUILE_LOAD_COMPILED_PATH" = "x" - then - GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/guile-readline" + if test "x$GUILE_LOAD_COMPILED_PATH" = "x"; then + GUILE_LOAD_COMPILED_PATH="${top_srcdir}/prebuilt/@host@" else - for d in "/bootstrap" "/module" "/guile-readline" - do - # This hair prevents double inclusion. - # The ":" prevents prefix aliasing. - case x"$GUILE_LOAD_COMPILED_PATH" in - x*${top_builddir}${d}:*) ;; - x*${top_builddir}${d}) ;; - *) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;; - esac - done + GUILE_LOAD_COMPILED_PATH="${top_srcdir}/prebuilt/@host@:$GUILE_LOAD_COMPILED_PATH" fi + + for d in "/bootstrap" "/module" "/guile-readline" + do + # This hair prevents double inclusion. + # The ":" prevents prefix aliasing. + case x"$GUILE_LOAD_COMPILED_PATH" in + x*${top_builddir}${d}:*) ;; + x*${top_builddir}${d}) ;; + *) GUILE_LOAD_COMPILED_PATH="${top_builddir}${d}:$GUILE_LOAD_COMPILED_PATH" ;; + esac + done export GUILE_LOAD_COMPILED_PATH # Don't look in installed dirs for guile modules |