build: x86_64 bootstrap build fixes and workaround.

[mes.git] / build-aux / build.sh.in

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index 5ef1131e5b841b57610b2eb715edef3d47281eee..836a6928921df6045b8f88ec9b65715ea895e60b 100755 (executable)
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -24,6 +24,7 @@ abs_top_srcdir="@abs_top_srcdir@"
 abs_top_builddir="@abs_top_builddir@"
 prefix=${prefix-@prefix@}
 VERSION=${VERSION-@VERSION@}
 abs_top_builddir="@abs_top_builddir@"
 prefix=${prefix-@prefix@}
 VERSION=${VERSION-@VERSION@}

+arch=${arch-@arch@}

 
 . ${srcdest}build-aux/config.sh
 . ${srcdest}build-aux/trace.sh
 
 . ${srcdest}build-aux/config.sh
 . ${srcdest}build-aux/trace.sh


@@ -53,6 +54,6 @@ if [ -n "$TCC" ]; then
 fi
 
 sh ${srcdest}build-aux/build-mes.sh
 fi
 
 sh ${srcdest}build-aux/build-mes.sh

-if [ "$MES" = guile ]; then
-    sh ${srcdest}build-aux/build-x86_64-mes.sh
+if [ "$arch" = x86_64 -a "$GUILE" ]; then
+    MES=$GUILE sh ${srcdest}build-aux/build-x86_64-mes.sh

 fi
 fi