diff options
| author | Neil Jerram <neil@ossau.uklinux.net> | 2010-03-02 23:23:52 +0000 |
|---|---|---|
| committer | Neil Jerram <neil@ossau.uklinux.net> | 2010-03-25 23:05:49 +0000 |
| commit | c9e1f32768232495d1452a45110115ac7c035acd (patch) | |
| tree | d87c2189e5a23a8a01d929916734db511d9137f5 | |
| parent | 7edad77c2e675a508ae04a97a689dfc1b9b74546 (diff) | |
| download | guile-historical/wip-1-8-mingw-build.tar.gz | |
cross-compiling should not imply need for and use of GUILE_FOR_BUILDbranch-notes/wip-1-8-mingw-buildhistorical/wip-1-8-mingw-build
| -rw-r--r-- | configure.in | 22 | ||||
| -rw-r--r-- | libguile/measure-hwm.scm | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 217ac83e3..6d25c34b5 100644 --- a/configure.in +++ b/configure.in @@ -1438,18 +1438,20 @@ AC_SUBST(CCLD_FOR_BUILD) HOST_CC="$CC_FOR_BUILD" AC_SUBST(HOST_CC) -if test "$cross_compiling" = "yes"; then - AC_MSG_CHECKING(guile for build) - GUILE_FOR_BUILD="${GUILE_FOR_BUILD-guile}" -else +## For some cross builds, where it is not possible to run the Guile +## that is being built, allow the caller to use GUILE_FOR_BUILD=... +## to specify another Guile to use during the build. +## +## But not all cross builds need this. In particular, when Wine is +## installed, a Linux - Mingw32 cross build _can_ run the Guile that +## is being built - and it is obviously better for it to do that. +## Hence the default is to use $(preinstguile), even when +## cross-compiling. +AC_MSG_CHECKING(guile for build) +if test -z "$GUILE_FOR_BUILD"; then GUILE_FOR_BUILD='$(preinstguile)' fi - -## AC_MSG_CHECKING("if we are cross compiling") -## AC_MSG_RESULT($cross_compiling) -if test "$cross_compiling" = "yes"; then - AC_MSG_RESULT($GUILE_FOR_BUILD) -fi +AC_MSG_RESULT($GUILE_FOR_BUILD) AC_ARG_VAR(GUILE_FOR_BUILD,[guile for build system]) AC_SUBST(GUILE_FOR_BUILD) diff --git a/libguile/measure-hwm.scm b/libguile/measure-hwm.scm index 53a30d560..b8ef5d2f0 100644 --- a/libguile/measure-hwm.scm +++ b/libguile/measure-hwm.scm @@ -134,3 +134,5 @@ ;; rational. (quotient (* default-stack-limit top-repl-hwm-measured) top-repl-hwm-i686-pc-linux-gnu)) + +(force-output) |