[Guile-commits] GNU Guile branch, wip-1-8-mingw-build, updated. release_1-8-7-23-gc9e1f32

[Neil Jerram]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=c9e1f32768232495d1452a45110115ac7c035acd

The branch, wip-1-8-mingw-build has been updated
       via  c9e1f32768232495d1452a45110115ac7c035acd (commit)
      from  7edad77c2e675a508ae04a97a689dfc1b9b74546 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9e1f32768232495d1452a45110115ac7c035acd
Author: Neil Jerram <address@hidden>
Date:   Tue Mar 2 23:23:52 2010 +0000

    cross-compiling should not imply need for and use of GUILE_FOR_BUILD

-----------------------------------------------------------------------

Summary of changes:
 configure.in             |   22 ++++++++++++----------
 libguile/measure-hwm.scm |    2 ++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index 217ac83..6d25c34 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 53a30d5..b8ef5d2 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)


hooks/post-receive
-- 
GNU Guile