ref: bb0bc06fa5b9f39436458ef53071bfb4c99c156d
parent: 6f498956e594c2567e1c8beeecc79e21e5c05613
parent: 12f26bf0bca573765ffdb609138e2079571a0f19
author: Johann Koenig <[email protected]>
date: Wed Oct 28 15:18:49 EDT 2015
Merge "Skip AS detection when using --enable-external-build"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1209,24 +1209,28 @@
check_gcc_machine_option avx
check_gcc_machine_option avx2
- case "${AS}" in- 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." \
- "See the prerequisites section in the README for more info."
- ;;
- esac
- log_echo " using $AS"
+ if enabled external_build; then
+ log_echo " skipping assembler detection"
+ else
+ case "${AS}" in+ 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." \
+ "See the prerequisites section in the README for more info."
+ ;;
+ esac
+ log_echo " using $AS"
+ fi
[ "${AS##*/}" = nasm ] && add_asflags -OxAS_SFX=.asm
case ${tgt_os} in