From 852829c31598daa78d3656c41707d76085634919 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 30 Jan 2015 14:39:01 -0800 Subject: [PATCH] Fail when only an old nasm is found 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/make/configure.sh b/build/make/configure.sh index 932dd8ef6..c0b5072e9 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -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" ;; -- 2.40.0