Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:02:01 +0000 (09:02 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 18 Aug 2015 07:02:01 +0000 (09:02 +0200)
* commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3':
  configure: arm: Assume softfp ABI on darwin

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
configure

index 55cc7fb64b2d844e03ba6f875b587ea22edf476a..a6c57d07f273bcf0436aded10ff7bd9a34621954 100755 (executable)
--- a/configure
+++ b/configure
@@ -4796,7 +4796,7 @@ EOF
         enable vfp_args
     elif check_cpp_condition stddef.h "defined _M_ARM_FP && _M_ARM_FP >= 30"; then
         enable vfp_args
-    elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__"; then
+    elif ! check_cpp_condition stddef.h "defined __ARM_PCS || defined __SOFTFP__" && [ $target_os != darwin ]; then
         case "${cross_prefix:-$cc}" in
             *hardfloat*)         enable vfp_args;   fpabi=vfp ;;
             *) check_ld "cc" <<EOF && enable vfp_args && fpabi=vfp || fpabi=soft ;;