diff options
| -rw-r--r-- | am/bootstrap.am | 2 | ||||
| -rw-r--r-- | am/guilec | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | doc/ref/Makefile.am | 2 | ||||
| -rw-r--r-- | libguile/Makefile.am | 2 | ||||
| -rw-r--r-- | meta/build-env.in | 121 | ||||
| -rw-r--r-- | module/Makefile.am | 2 | ||||
| -rw-r--r-- | test-suite/standalone/Makefile.am | 2 |
8 files changed, 129 insertions, 7 deletions
diff --git a/am/bootstrap.am b/am/bootstrap.am index 0eaa87b06..d5f25abfa 100644 --- a/am/bootstrap.am +++ b/am/bootstrap.am @@ -41,7 +41,7 @@ SUFFIXES = .scm .go .scm.go: $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \ - $(top_builddir)/meta/uninstalled-env \ + $(top_builddir)/meta/build-env \ guild compile --target="$(GUILE_TARGET)" \ $(GUILE_WARNINGS) $(GUILE_OPTIMIZATIONS) \ -L "$(abs_top_srcdir)/module" \ @@ -28,7 +28,7 @@ SUFFIXES = .scm .el .go .scm.go: $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \ - $(top_builddir)/meta/uninstalled-env \ + $(top_builddir)/meta/build-env \ guild compile --target="$(host)" $(GUILE_WARNINGS) \ -L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_top_srcdir)/guile-readline" \ @@ -36,7 +36,7 @@ SUFFIXES = .scm .el .go .el.go: $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \ - $(top_builddir)/meta/uninstalled-env \ + $(top_builddir)/meta/build-env \ guild compile --target="$(host)" $(GUILE_WARNINGS) \ -L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_top_srcdir)/guile-readline" \ diff --git a/configure.ac b/configure.ac index 4c78b0712..1735c5606 100644 --- a/configure.ac +++ b/configure.ac @@ -1663,6 +1663,7 @@ AC_CONFIG_FILES([ GUILE_CONFIG_SCRIPT([check-guile]) GUILE_CONFIG_SCRIPT([benchmark-guile]) GUILE_CONFIG_SCRIPT([meta/guile]) +GUILE_CONFIG_SCRIPT([meta/build-env]) GUILE_CONFIG_SCRIPT([meta/uninstalled-env]) GUILE_CONFIG_SCRIPT([meta/gdb-uninstalled-guile]) GUILE_CONFIG_SCRIPT([libguile/guile-snarf]) diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am index 83c6e5ee0..ada4f363b 100644 --- a/doc/ref/Makefile.am +++ b/doc/ref/Makefile.am @@ -120,7 +120,7 @@ EXTRA_DIST = ChangeLog-2008 $(PICTURES) libguile-autoconf.texi: autoconf-macros.texi autoconf-macros.texi: $(top_srcdir)/meta/guile.m4 - GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild \ + GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/build-env guild \ snarf-guile-m4-docs $(top_srcdir)/meta/guile.m4 \ > $(srcdir)/$@ diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 909101c51..855a57faa 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -762,7 +762,7 @@ load.x: libpath.h dynl.x: libpath.h alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) -snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi +snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/build-env guild snarf-check-and-output-texi dotdoc2texi = cat $(alldotdocfiles) | $(snarf2checkedtexi) guile.texi: $(alldotdocfiles) guile$(EXEEXT) diff --git a/meta/build-env.in b/meta/build-env.in new file mode 100644 index 000000000..7a5bf3339 --- /dev/null +++ b/meta/build-env.in @@ -0,0 +1,121 @@ +#!/bin/sh + +# Copyright (C) 2003, 2006, 2008-2012, 2016 Free Software Foundation +# +# This file is part of GNU Guile. +# +# This script is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 3 of the +# License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA + +# Usage: build-env [ARGS] + +# This script arranges for the environment to support running Guile from +# the build tree. Unlike uninstalled-env, we clobber the environment so +# as to avoid inheriting environment variables that could make Guile +# load .scm, .go, or .so files from installed directories. + +# Example: build-env guile -c '(display "hello\n")' +# Example: ../../build-env ./guile-test-foo + +top_srcdir="@top_srcdir_absolute@" +top_builddir="@top_builddir_absolute@" + +[ x"$top_srcdir" = x -o ! -d "$top_srcdir" -o \ + x"$top_builddir" = x -o ! -d "$top_builddir" ] && { + echo $0: bad environment + echo top_srcdir=$top_srcdir + echo top_builddir=$top_builddir + exit 1 +} + +# When cross-compiling, let $GUILE_FOR_BUILD use its own .go files since +# the ones that are being built may be incompatible ($GUILE_FOR_BUILD is +# typically used to run `guild compile --target=$host'.) Likewise, +# $GUILE_FOR_BUILD must use its own source files when booting; for +# instance, $srcdir/module/ice-9/boot-9.scm must not be in its search +# path, because it would then end up using its C evaluator to run the +# compiler. +if test "@cross_compiling@" = "no" +then + GUILE_LOAD_PATH="${top_srcdir}/module:${top_srcdir}/guile-readline" + if test "${top_srcdir}" != "${top_builddir}"; 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_builddir}/prebuilt/@host@:${top_builddir}/guile-readline" + export GUILE_LOAD_COMPILED_PATH + + # Don't look in installed dirs for guile modules + if ( env | grep -v '^GUILE_SYSTEM_PATH=' > /dev/null ); then + GUILE_SYSTEM_PATH= + export GUILE_SYSTEM_PATH + fi + # Don't look in installed dirs for compiled guile modules + if ( env | grep -v '^GUILE_SYSTEM_COMPILED_PATH=' > /dev/null ); then + GUILE_SYSTEM_COMPILED_PATH= + export GUILE_SYSTEM_COMPILED_PATH + fi + # Don't look in installed dirs for dlopen-able modules + if ( env | grep -v '^GUILE_SYSTEM_EXTENSIONS_PATH=' > /dev/null ); then + GUILE_SYSTEM_EXTENSIONS_PATH= + export GUILE_SYSTEM_EXTENSIONS_PATH + fi +fi + +# handle LTDL_LIBRARY_PATH (no clobber) +for dir in guile-readline libguile ; do + if test -z "$LTDL_LIBRARY_PATH"; then + LTDL_LIBRARY_PATH="${top_builddir}/${dir}" + else + LTDL_LIBRARY_PATH="${top_builddir}/${dir}:${LTDL_LIBRARY_PATH}" + fi + if test -z "$DYLD_LIBRARY_PATH"; then + DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs" + else + DYLD_LIBRARY_PATH="${top_builddir}/${dir}/.libs:${DYLD_LIBRARY_PATH}" + fi +done +export LTDL_LIBRARY_PATH +export DYLD_LIBRARY_PATH + +if [ x"$PKG_CONFIG_PATH" = x ] +then + PKG_CONFIG_PATH="${top_builddir}/meta" +else + PKG_CONFIG_PATH="${top_builddir}/meta:$PKG_CONFIG_PATH" +fi +export PKG_CONFIG_PATH + +# handle PATH (no clobber) +PATH="${top_builddir}/libguile:${PATH}" +PATH="${top_srcdir}/meta:${PATH}" +if test "x${top_srcdir}" != "x${top_builddir}"; then + PATH="${top_builddir}/meta:${PATH}" +fi +export PATH + +# Define $GUILE, used by `guild'. +if test "@cross_compiling@" = "no" +then + GUILE=${top_builddir}/libguile/guile@EXEEXT@ +else + GUILE="@GUILE_FOR_BUILD@" +fi +export GUILE + +XDG_CACHE_HOME=${top_builddir}/cache +export XDG_CACHE_HOME + +exec "$@" diff --git a/module/Makefile.am b/module/Makefile.am index 3f14ed8b4..f590fb96d 100644 --- a/module/Makefile.am +++ b/module/Makefile.am @@ -36,7 +36,7 @@ $(nobase_ccache_DATA): ../bootstrap/ice-9/eval.go # Keep this rule in sync with that in `am/guilec'. ice-9/psyntax-pp.go: ice-9/psyntax.scm ice-9/psyntax-pp.scm $(AM_V_GUILEC)GUILE_AUTO_COMPILE=0 \ - $(top_builddir)/meta/uninstalled-env \ + $(top_builddir)/meta/build-env \ guild compile --target="$(host)" $(GUILE_WARNINGS) \ -L "$(abs_srcdir)" -L "$(abs_builddir)" \ -L "$(abs_top_srcdir)/guile-readline" \ diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am index 524a1445e..2aba708da 100644 --- a/test-suite/standalone/Makefile.am +++ b/test-suite/standalone/Makefile.am @@ -35,7 +35,7 @@ TESTS_ENVIRONMENT = \ srcdir="$(srcdir)" \ builddir="$(builddir)" \ @LOCALCHARSET_TESTS_ENVIRONMENT@ \ - GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env" + GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/build-env" ## Check for headers in $(srcdir) and build dir before $(CPPFLAGS), which ## may point us to an old, installed version of guile. |