From 08d75a8ec9bd0b795398a88002c5357b3487855d Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Wed, 25 Jun 2014 18:06:17 -0700 Subject: [PATCH] configure.sh: Tweak default of use_x86inc for 64-bit, non-pic, and Darwin. Mainly a readability fix. Change-Id: Idfd4de9f25d9b9f9931d8e885d9d031473d5df6d --- build/make/configure.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/make/configure.sh b/build/make/configure.sh index d4124c722..44bd1046b 100755 --- 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