2008-03-19 Marek Safar <marek.safar@gmail.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 43a6da9e10aef9fc3f5441475c4a2e210a6762bd..b7f322ac902f09ededddfbb3b0b89e32c95a010c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -232,6 +232,9 @@ case "$host" in
                no_version_script=yes
                libdl=
                libgc_threads=pthreads
+               if test "x$cross_compiling" = "xyes"; then
+                       has_broken_apple_cpp=yes
+               fi
                ;;
        *)
                AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -1300,11 +1303,13 @@ if test x$platform_win32 = xno; then
        dnl *** Checks for math functions ***
        dnl *********************************
         LIBS="$LIBS -lm";
-        AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
-                AC_TRY_LINK([#include <math.h>], 
-                [ finite(0.0); ], 
-                AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
-                AC_MSG_RESULT(no)))
+       if text "x$has_broken_apple_cpp" != "xyes"; then
+               AC_CHECK_FUNCS(finite, , AC_MSG_CHECKING(for finite in math.h)
+                       AC_TRY_LINK([#include <math.h>], 
+                       [ finite(0.0); ], 
+                       AC_DEFINE(HAVE_FINITE) AC_MSG_RESULT(yes),
+                       AC_MSG_RESULT(no)))
+       fi
         AC_CHECK_FUNCS(isfinite, , AC_MSG_CHECKING(for isfinite in math.h)
                 AC_TRY_LINK([#include <math.h>], 
                 [ isfinite(0.0); ], 
@@ -1779,6 +1784,14 @@ case "$host" in
                JIT_SUPPORTED=yes
                jit_wanted=true
                ;;
+       arm*-darwin*)
+               TARGET=ARM;
+               arch_target=arm;
+               ACCESS_UNALIGNED="no"
+               JIT_SUPPORTED=yes
+               CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+               jit_wanted=true
+               ;;
        arm*-linux*)
                TARGET=ARM;
                arch_target=arm;
@@ -1949,7 +1962,7 @@ if test "x$with_tls" = "x__thread"; then
        ])
 fi
 
-if test ${TARGET} = ARM; then
+if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
        dnl ******************************************
        dnl *** Check to see what FPU is available ***
        dnl ******************************************
@@ -2209,7 +2222,6 @@ fi
     echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
     echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
     echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
-
     case $INSTALL in
     [[\\/$]]* | ?:[[\\/]]* ) mcs_INSTALL=$INSTALL ;;
     *) mcs_INSTALL=$mono_build_root/$INSTALL ;;