]> granicus.if.org Git - libvpx/commitdiff
Delay SSE check until the compiler is configured.
authorJohann <johann.koenig@duck.com>
Sat, 26 Jan 2013 00:43:09 +0000 (16:43 -0800)
committerJohann <johann.koenig@duck.com>
Sat, 26 Jan 2013 00:43:09 +0000 (16:43 -0800)
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

build/make/configure.sh

index d4aa0ff74693d1d205688de1487bf2d5d0805594..1ac3035253a114e7e7cafb3acc52905109b8a92d 100755 (executable)
@@ -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