NASM is more actively maintained and permits generating dependency information
as a sideeffect of assembling, thus cutting build times in half.
---
 configure | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 08c1e5d..a217a69 100755
--- a/configure
+++ b/configure
@@ -2549,7 +2549,6 @@ pkg_config_default=pkg-config
 ranlib="ranlib"
 strip="strip"
 version_script='--version-script'
-asmexe="yasm"
 
 # machine
 arch_default=$(uname -m)
@@ -4433,15 +4432,16 @@ EOF
     enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
 
     if ! disabled_any asm mmx assembler; then
-        if check_cmd $asmexe --version; then
-            enabled x86_64 && asm_extra="-m amd64"
-            asm_debug="-g dwarf2"
-            ASMDEP='$(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d)'
-        elif check_cmd nasm -v; then
+        if check_cmd nasm -v; then
             asmexe=nasm
             asm_debug="-g -F dwarf"
             ASM_DEPFLAGS='-MD $(@:.o=.d)'
             enabled x86_64 && test "$objformat" = elf && objformat=elf64
+        elif check_cmd yasm --version; then
+            asmexe=yasm
+            enabled x86_64 && asm_extra="-m amd64"
+            asm_debug="-g dwarf2"
+            ASMDEP='$(DEPASM) $(ASMFLAGS) -M -o $@ $< > $(@:.o=.d)'
         fi
 
         ASMFLAGS="-f $objformat $asm_extra"
@@ -4452,7 +4452,7 @@ EOF
         esac
 
         check_asm "movbe ecx, [5]" && enable assembler ||
-            die "yasm/nasm not found or too old. Use --disable-assembler for a 
crippled build."
+            die "nasm/yasm not found or too old. Use --disable-assembler for a 
crippled build."
         check_asm "vextracti128 xmm0, ymm0, 0"      || disable avx2_external
         check_asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
         check_asm "vfmadd132ps ymm0, ymm1, ymm2"    || disable fma3_external
-- 
2.1.4

_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to