ref: 51945a54003f5dcc7642467ad0718f701d526764
parent: f5b3631621273ea687c8564a982e6a2c12b11962
parent: 852829c31598daa78d3656c41707d76085634919
author: Johann <johannkoenig@google.com>
date: Tue Feb 3 06:19:24 EST 2015
Merge "Fail when only an old nasm is found"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1159,6 +1159,14 @@
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"
;;
--
⑨