diff options
| author | Tom Finegan <tomfinegan@google.com> | 2014-06-27 16:17:35 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-27 16:17:35 -0700 |
| commit | 1fba21a2b19ba2b847f4598b910b10280a949710 (patch) | |
| tree | 2547046794f7b38bd1015b43d6547610ab2d9617 /build/make/configure.sh | |
| parent | a5f49183da7720f78176e7aacd66ddfa30fd4337 (diff) | |
| parent | 08d75a8ec9bd0b795398a88002c5357b3487855d (diff) | |
| download | libvpx-1fba21a2b19ba2b847f4598b910b10280a949710.tar libvpx-1fba21a2b19ba2b847f4598b910b10280a949710.tar.gz libvpx-1fba21a2b19ba2b847f4598b910b10280a949710.tar.bz2 libvpx-1fba21a2b19ba2b847f4598b910b10280a949710.zip | |
Merge "configure.sh: Tweak default of use_x86inc for 64-bit, non-pic, and Darwin."
Diffstat (limited to 'build/make/configure.sh')
| -rwxr-xr-x | build/make/configure.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index 0fe8ead2e..bda11b7ce 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 |