mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

configure detects which set of prebuilt binaries to use

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2017-03-14 09:43:50 +01:00
parent 0543ec96b2
commit c50c3a47b3
7 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -631,6 +631,18 @@ AC_SUBST([SCM_I_GSC_T_UINTPTR])
AC_SUBST([SCM_I_GSC_NEEDS_STDINT_H])
AC_SUBST([SCM_I_GSC_NEEDS_INTTYPES_H])
AC_MSG_CHECKING([for which prebuilt binary set to use during bootstrap])
SCM_PREBUILT_BINARIES=
case "$ac_cv_c_bigendian-$ac_cv_sizeof_void_p" in
yes-8) SCM_PREBUILT_BINARIES=64-bit-big-endian;;
yes-4) SCM_PREBUILT_BINARIES=32-bit-big-endian;;
no-8) SCM_PREBUILT_BINARIES=64-bit-little-endian;;
no-4) SCM_PREBUILT_BINARIES=32-bit-little-endian;;
*) AC_MSG_ERROR([Unexpected endianness+pointer size combination.])
esac
AC_MSG_RESULT($SCM_PREBUILT_BINARIES)
AC_SUBST([SCM_PREBUILT_BINARIES])
AC_HEADER_STDC
AC_HEADER_TIME
AC_HEADER_SYS_WAIT

4
meta/build-env.in
View file

@ -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

4
meta/uninstalled-env.in
View file

@ -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.

1
prebuilt/32-bit-big-endian Symbolic link
View file

@ -0,0 +1 @@
mips-unknown-linux-gnu

1
prebuilt/32-bit-little-endian Symbolic link
View file

@ -0,0 +1 @@
i686-pc-linux-gnu

1
prebuilt/64-bit-little-endian Symbolic link
View file

@ -0,0 +1 @@
x86_64-unknown-linux-gnu

1
prebuilt/x86_64-pc-linux-gnu
View file

@ -1 +0,0 @@
./x86_64-unknown-linux-gnu