ref: 118b9931d7645b19c9b111e6f95ed0ab183d9fef
parent: 538c6ea3d362db71dc34de3941a01d1e5481e664
parent: 5d0174bc02955450657ab0fb088d6e699f28404f
author: John Koleszar <jkoleszar@google.com>
date: Mon Jun 11 08:02:35 EDT 2012
Merge "Skip AS detection for VS"
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1008,7 +1008,7 @@
tune_cflags="-march="
;;
esac
- ;;
+ ;;
gcc*)
add_cflags -m${bits}
add_ldflags -m${bits}
@@ -1017,7 +1017,13 @@
setup_gnu_toolchain
#for 32 bit x86 builds, -O3 did not turn on this flag
enabled optimizations && check_add_cflags -fomit-frame-pointer
- ;;
+ ;;
+ vs*)
+ # When building with Microsoft Visual Studio the assembler is
+ # invoked directly. Checking at configure time is unnecessary.
+ # Skip the check by setting AS arbitrarily
+ AS=msvs
+ ;;
esac
case "${AS}" in
@@ -1026,7 +1032,7 @@
which yasm >/dev/null 2>&1 && AS=yasm
[ "${AS}" = auto -o -z "${AS}" ] \
&& die "Neither yasm nor nasm have been found"
- ;;
+ ;;
esac
log_echo " using $AS"
[ "${AS##*/}" = nasm ] && add_asflags -Ox
--
⑨