]> granicus.if.org Git - libvpx/commitdiff
Skip AS detection for VS
authorJohann Koenig <johannkoenig@dhcp-172-19-7-52.mtv.corp.google.com>
Mon, 12 Dec 2011 17:43:42 +0000 (09:43 -0800)
committerJohann <johannkoenig@google.com>
Tue, 5 Jun 2012 22:40:59 +0000 (15:40 -0700)
Visual Studio doesn't use the assembler in $PATH

Change-Id: I169f8492127cbc1d256a2fb2e749cd970040ccc8

build/make/configure.sh

index f8d69aed1e998cfb9d7cab70ec2a03880502c45f..575a394ffc4af5caf190adce6458e136d7845d4e 100755 (executable)
@@ -1008,7 +1008,7 @@ process_common_toolchain() {
                         tune_cflags="-march="
                     ;;
                 esac
-                ;;
+            ;;
             gcc*)
                 add_cflags -m${bits}
                 add_ldflags -m${bits}
@@ -1017,7 +1017,13 @@ process_common_toolchain() {
             setup_gnu_toolchain
                 #for 32 bit x86 builds, -O3 did not turn on this flag
                 enabled optimizations && check_add_cflags -fomit-frame-pointer
-                ;;
+            ;;
+            vs*)
+                # When building with Microsoft Visual Studio the assembler is
+                # invoked directly. Checking at configure time is unnecessary.
+                # Skip the check by setting AS arbitrarily
+                AS=msvs
+            ;;
         esac
 
         case "${AS}" in
@@ -1026,7 +1032,7 @@ process_common_toolchain() {
                 which yasm >/dev/null 2>&1 && AS=yasm
                 [ "${AS}" = auto -o -z "${AS}" ] \
                     && die "Neither yasm nor nasm have been found"
-                ;;
+            ;;
         esac
         log_echo "  using $AS"
         [ "${AS##*/}" = nasm ] && add_asflags -Ox