From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 9 Nov 2011 06:27:20 +0000 (-0800)
Subject: Properly fix default-target setting code.
X-Git-Tag: release-9.1.1^0
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=refs%2Fremotes%2Forigin%2Frelease-9.1;p=mit-scheme.git

Properly fix default-target setting code.
---

diff --git a/dist/make-native-files b/dist/make-native-files
index 9e9b26376..ccd647ec6 100755
--- a/dist/make-native-files
+++ b/dist/make-native-files
@@ -47,9 +47,9 @@ shift 2
 build ()
 {
     my_configure --enable-native-code="${ARCH}" \
-	--with-mcrypt=no --with-libpq=no --with-db-4=no \
-	--with-default-target=compile-microcode
-    my_make all
+	--with-mcrypt=no --with-libpq=no --with-db-4=no
+    my_make
+    touch .native-release-marker
 }
 
 OUT_ROOT=${NATIVE_OUT}-${ARCH}
diff --git a/src/configure.ac b/src/configure.ac
index 4c0263e0c..3c794692f 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
 USA.
 ])
 
+if test -f .native-release-marker; then
+    IS_NATIVE_RELEASE=yes
+else
+    IS_NATIVE_RELEASE=no
+fi
+
 AC_ARG_ENABLE([debugging],
     AS_HELP_STRING([--enable-debugging],
 	[Compile with debugging support [[no]]]))
@@ -42,16 +48,21 @@ AC_ARG_ENABLE([native-code],
 AC_ARG_ENABLE([host-scheme-test],
     AS_HELP_STRING([--enable-host-scheme-test],
 	[Test for working scheme on build host [[if necessary]]]))
-if test -f lib/all.com; then
-  : ${enable_host_scheme_test=no}
+if test x"${IS_NATIVE_RELEASE}" = xyes || test -f lib/all.com; then
+    : ${enable_host_scheme_test=no}
 else
-  : ${enable_host_scheme_test=yes}
+    : ${enable_host_scheme_test=yes}
 fi
 
 AC_ARG_WITH([default-target],
     AS_HELP_STRING([--with-default-target],
 	[Set the default make target [[all]]]))
-DEFAULT_TARGET=${with_default_target=all}
+if test x"${IS_NATIVE_RELEASE}" = xyes; then
+    : ${with_default_target=compile-microcode}
+else
+    : ${with_default_target=all}
+fi
+DEFAULT_TARGET=${with_default_target}
 
 AC_CANONICAL_HOST