diff options
| author | Johann <johannkoenig@google.com> | 2015-10-26 16:40:17 -0700 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2015-10-26 16:43:59 -0700 |
| commit | 12f26bf0bca573765ffdb609138e2079571a0f19 (patch) | |
| tree | 56d16d3ee42a2405867fd0ecf806d8cd6a7b5450 /build/make/configure.sh | |
| parent | dc9d36c0a6c749616d5543aa208864d7b0181fea (diff) | |
| download | libvpx-12f26bf0bca573765ffdb609138e2079571a0f19.tar libvpx-12f26bf0bca573765ffdb609138e2079571a0f19.tar.gz libvpx-12f26bf0bca573765ffdb609138e2079571a0f19.tar.bz2 libvpx-12f26bf0bca573765ffdb609138e2079571a0f19.zip | |
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
Diffstat (limited to 'build/make/configure.sh')
| -rw-r--r-- | build/make/configure.sh | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/build/make/configure.sh b/build/make/configure.sh index c592b6385..a15778c5c 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1207,24 +1207,28 @@ EOF 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 -Ox AS_SFX=.asm case ${tgt_os} in |