summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann <johann.koenig@duck.com>2013-01-25 16:43:09 -0800
committerJohann <johann.koenig@duck.com>2013-01-25 16:43:09 -0800
commit1a0f52485a8d34c0a2cfe1df09e58300962628f6 (patch)
treec8c3a3a629f7b545f3934d08398f5f7f0e9fe2c7
parente48776f29bbc991b1842c80baf8f3b3d5e24eceb (diff)
downloadlibvpx-1a0f52485a8d34c0a2cfe1df09e58300962628f6.tar
libvpx-1a0f52485a8d34c0a2cfe1df09e58300962628f6.tar.gz
libvpx-1a0f52485a8d34c0a2cfe1df09e58300962628f6.tar.bz2
libvpx-1a0f52485a8d34c0a2cfe1df09e58300962628f6.zip
Delay SSE check until the compiler is configured.
Move SSE4 detection below compiler configuration. Otherwise ${CC} may not be populated. We are specifically interested in -msse4.1. Narrow detection code. Change-Id: I0ffac49e91b3fdb2aceb6eb6b90dc1c10b159111
-rwxr-xr-xbuild/make/configure.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh
index d4aa0ff74..1ac303525 100755
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1011,11 +1011,6 @@ EOF
soft_enable sse2
soft_enable sse3
soft_enable ssse3
- if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4; then
- RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
- else
- soft_enable sse4_1
- fi
case ${tgt_os} in
win*)
@@ -1057,7 +1052,7 @@ EOF
add_ldflags -m${bits}
link_with_cc=gcc
tune_cflags="-march="
- setup_gnu_toolchain
+ setup_gnu_toolchain
#for 32 bit x86 builds, -O3 did not turn on this flag
enabled optimizations && check_add_cflags -fomit-frame-pointer
;;
@@ -1069,6 +1064,14 @@ EOF
;;
esac
+ # We can't use 'check_cflags' until the compiler is configured and CC is
+ # populated.
+ if enabled gcc && ! disabled sse4_1 && ! check_cflags -msse4.1; then
+ RTCD_OPTIONS="${RTCD_OPTIONS}--disable-sse4_1 "
+ else
+ soft_enable sse4_1
+ fi
+
case "${AS}" in
auto|"")
which nasm >/dev/null 2>&1 && AS=nasm