summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 09:02:01 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-08-18 09:02:01 +0200
commitfdca9350139bae44623b90a7db4d8116c3487372 (patch)
tree2466861fc1e6459e592cc5795a16cdafb83b0078 /configure
parent9c22aedd265ef38dc240d107171eb846fdef744a (diff)
parentcb2dbe2c762dae44d890aa26620bcdd9022fd0f3 (diff)
Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3'
* commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3': configure: arm: Assume softfp ABI on darwin Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 55cc7fb64b..a6c57d07f2 100755
--- 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 ;;