diff options
| author | Andy Wingo <wingo@pobox.com> | 2017-03-14 09:43:50 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2017-03-14 09:49:17 +0100 |
| commit | c50c3a47b328c10780f4453b925a3e36d182c2bd (patch) | |
| tree | 9cd25beff8fc824c748cd647673de51ab67741d9 /meta | |
| parent | 0543ec96b22001d884fa444f55807825c70fa719 (diff) | |
configure detects which set of prebuilt binaries to use
* configure.ac: Use detected endianness and word size to automatically
select which set of prebuilt binaries to use.
* meta/build-env.in (top_builddir):
* meta/uninstalled-env.in (top_builddir): Update to use
SCM_PREBUILT_BINARIES for prebuilt entry in GUILE_LOAD_COMPILED_PATH.
* prebuilt/32-bit-big-endian:
* prebuilt/32-bit-little-endian:
* prebuilt/64-bit-little-endian: New links.
* prebuilt/x86_64-pc-linux-gnu: Remove this link now that it's unneeded.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/build-env.in | 4 | ||||
| -rw-r--r-- | meta/uninstalled-env.in | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/build-env.in b/meta/build-env.in index b271d0bc8..27e604366 100644 --- a/meta/build-env.in +++ b/meta/build-env.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2003, 2006, 2008-2012, 2016 Free Software Foundation +# Copyright (C) 2003, 2006, 2008-2012, 2016, 2017 Free Software Foundation # # This file is part of GNU Guile. # @@ -54,7 +54,7 @@ then GUILE_LOAD_PATH="$GUILE_LOAD_PATH:${top_builddir}/module:${top_builddir}/guile-readline" fi export GUILE_LOAD_PATH - GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/bootstrap:${top_srcdir}/prebuilt/@host@:${top_builddir}/guile-readline" + GUILE_LOAD_COMPILED_PATH="${top_builddir}/module:${top_builddir}/bootstrap:${top_srcdir}/prebuilt/@SCM_PREBUILT_BINARIES@:${top_builddir}/guile-readline" export GUILE_LOAD_COMPILED_PATH # Don't look in installed dirs for guile modules diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in index ff32902d0..ed932d0cb 100644 --- a/meta/uninstalled-env.in +++ b/meta/uninstalled-env.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011, 2012, 2015 Free Software Foundation +# Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011, 2012, 2015, 2017 Free Software Foundation # # This file is part of GUILE. # @@ -80,7 +80,7 @@ then fi export GUILE_LOAD_PATH - for d in "/prebuilt/@host@" "/bootstrap" "/module" "/guile-readline" + for d in "/prebuilt/@SCM_PREBUILT_BINARIES@" "/bootstrap" "/module" "/guile-readline" do # This hair prevents double inclusion. # The ":" prevents prefix aliasing. |