]> granicus.if.org Git - libvpx/commitdiff
Fail when only an old nasm is found
authorJohann <johannkoenig@google.com>
Fri, 30 Jan 2015 22:39:01 +0000 (14:39 -0800)
committerJohann <johannkoenig@google.com>
Tue, 3 Feb 2015 16:55:00 +0000 (08:55 -0800)
Apple ships version 0.98 of nasm through at least XCode 6. It is
incompatible with the assembly in libvpx.

https://code.google.com/p/webm/issues/detail?id=772

Change-Id: I33245a76f50a8224fe6fafa3cce9991f953fdcc8

build/make/configure.sh

index 932dd8ef61b36fd16b7493b0084b98c78425e70b..c0b5072e985acc4ff35363a468b350df26c27e99 100644 (file)
@@ -1159,6 +1159,14 @@ EOF
         auto|"")
           which nasm >/dev/null 2>&1 && AS=nasm
           which yasm >/dev/null 2>&1 && AS=yasm
+          if [ "${AS}" = nasm ] ; then
+            # Apple ships version 0.98 of nasm through at least Xcode 6. Revisit
+            # this check if they start shipping a compatible version.
+            apple=`nasm -v | grep "Apple"`
+            [ -n "${apple}" ] \
+              && echo "Unsupported version of nasm: ${apple}" \
+              && AS=""
+          fi
           [ "${AS}" = auto ] || [ -z "${AS}" ] \
             && die "Neither yasm nor nasm have been found"
           ;;