---
configure | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index d03707e..4d5dcf3 100755
--- a/configure
+++ b/configure
@@ -261,7 +261,8 @@ Toolchain options:
--toolchain=NAME set tool defaults according to NAME
--nm=NM use nm tool
--ar=AR use archive tool AR [$ar_default]
- --as=AS use assembler AS [$as_default]
+ --as=AS use integrated assembler AS [$as_default]
+ --asm=ASM use standalone assembler ASM [$asm_default]
--cc=CC use C compiler CC [$cc_default]
--objcc=OCC use ObjC compiler OCC [$cc_default]
--dep-cc=DEPCC use dependency generator DEPCC [$cc_default]
@@ -825,7 +826,7 @@ check_asm(){
echo "$1" > $TMPS
log_file $TMPS
shift 1
- check_cmd $asmexe $ASMFLAGS "$@" -o $TMPO $TMPS
+ check_cmd $asm $ASMFLAGS "$@" -o $TMPO $TMPS
}
ld_o(){
@@ -1785,6 +1786,7 @@ CMDLINE_SET="
ar
arch
as
+ asm
build_suffix
cc
objcc
@@ -2481,6 +2483,7 @@ shlibdir_default="$libdir_default"
# toolchain
ar_default="ar"
+asm_default="yasm"
cc_default="gcc"
host_cc_default="gcc"
cp_f="cp -f"
@@ -2491,7 +2494,6 @@ pkg_config_default=pkg-config
ranlib="ranlib"
strip="strip"
version_script='--version-script'
-asmexe="yasm"
# machine
arch_default=$(uname -m)
@@ -2886,7 +2888,7 @@ strip="${cross_prefix}${strip}"
sysinclude_default="${sysroot}/usr/include"
-set_default arch cc pkg_config sysinclude target_exec target_os
+set_default arch asm cc pkg_config sysinclude target_exec target_os
enabled cross_compile || host_cc_default=$cc
set_default host_cc
@@ -4381,7 +4383,7 @@ EOF
enabled x86_64 && asm_extra="-m amd64"
asm_debug="-g dwarf2"
elif check_cmd nasm -v; then
- asmexe=nasm
+ asm=nasm
asm_debug="-g -F dwarf"
enabled x86_64 && test "$objformat" = elf && objformat=elf64
fi
@@ -5234,8 +5236,8 @@ DEPCC=$dep_cc
DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
-ASM=$asmexe
-DEPASM=$asmexe
+ASM=$asm
+DEPASM=$asm
AR=$ar
ARFLAGS=$arflags
AR_O=$ar_o
--
2.1.4
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
