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

The option exists specifically to allow for configurations
where the build environment is different from the configure
environment.

Change-Id: I95196fa3c49700251d10ff5d256dc7380e39d0c4
This commit is contained in:
Johann
2015-10-26 16:40:17 -07:00
parent dc9d36c0a6
commit 12f26bf0bc

View File

@@ -1207,6 +1207,9 @@ EOF
check_gcc_machine_option avx check_gcc_machine_option avx
check_gcc_machine_option avx2 check_gcc_machine_option avx2
if enabled external_build; then
log_echo " skipping assembler detection"
else
case "${AS}" in case "${AS}" in
auto|"") auto|"")
which nasm >/dev/null 2>&1 && AS=nasm which nasm >/dev/null 2>&1 && AS=nasm
@@ -1225,6 +1228,7 @@ EOF
;; ;;
esac esac
log_echo " using $AS" 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