generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Skip AS detection when using --enable-external-build"

Browse Source
This commit is contained in:
Johann Koenig 2015-10-28 19:18:49 +00:00 committed by Gerrit Code Review
commit bb0bc06fa5
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/make/configure.sh
View File

@ -1209,24 +1209,28 @@ EOF
check_gcc_machine_option avx check_gcc_machine_option avx
check_gcc_machine_option avx2 check_gcc_machine_option avx2
case "${AS}" in if enabled external_build; then
auto|"") log_echo " skipping assembler detection"
which nasm >/dev/null 2>&1 && AS=nasm else
which yasm >/dev/null 2>&1 && AS=yasm case "${AS}" in
if [ "${AS}" = nasm ] ; then auto|"")
# Apple ships version 0.98 of nasm through at least Xcode 6. Revisit which nasm >/dev/null 2>&1 && AS=nasm
# this check if they start shipping a compatible version. which yasm >/dev/null 2>&1 && AS=yasm
apple=`nasm -v | grep "Apple"` if [ "${AS}" = nasm ] ; then
[ -n "${apple}" ] \ # Apple ships version 0.98 of nasm through at least Xcode 6. Revisit
&& echo "Unsupported version of nasm: ${apple}" \ # this check if they start shipping a compatible version.
&& AS="" apple=`nasm -v | grep "Apple"`
fi [ -n "${apple}" ] \
[ "${AS}" = auto ] || [ -z "${AS}" ] \ && echo "Unsupported version of nasm: ${apple}" \
&& die "Neither yasm nor nasm have been found." \ && AS=""
"See the prerequisites section in the README for more info." fi
;; [ "${AS}" = auto ] || [ -z "${AS}" ] \
esac && die "Neither yasm nor nasm have been found." \
log_echo " using $AS" "See the prerequisites section in the README for more info."
;;
esac
log_echo " using $AS"
fi
[ "${AS##*/}" = nasm ] && add_asflags -Ox [ "${AS##*/}" = nasm ] && add_asflags -Ox
AS_SFX=.asm AS_SFX=.asm
case ${tgt_os} in case ${tgt_os} in