configure.sh: Tweak default of use_x86inc for 64-bit, non-pic, and Darwin.

Mainly a readability fix.

Change-Id: Idfd4de9f25d9b9f9931d8e885d9d031473d5df6d

diff --git a/build/make/configure.sh b/build/make/configure.sh
index d4124c72204922a085184f8d11ad68380e88c1da..44bd1046bc93a93cad2c5889baabc67554941c7d 100755 (executable)
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1222,10 +1222,12 @@ EOF
         fi
     fi
 
-    # default use_x86inc to yes if pic is no or 64bit or we are not on darwin
-    if [ ${tgt_isa} = x86_64 -o ! "$pic" = "yes" -o \
-         "${tgt_os#darwin}" = "${tgt_os}"  ]; then
-      soft_enable use_x86inc
+    tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]")
+    # Default use_x86inc to yes when we are 64 bit, non-pic, or on any
+    # non-Darwin target.
+    if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \
+            [ "${tgt_os_no_version}" != "darwin" ]; then
+        soft_enable use_x86inc
     fi
 
     # Position Independent Code (PIC) support, for building relocatable