This allows setting OS-specific defaults from the OS section.
---
configure | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 6b52eff..84842bd 100755
--- a/configure
+++ b/configure
@@ -2674,7 +2674,7 @@ test -n "$cc_type" && enable $cc_type ||
: ${dep_cc_default:=$cc}
: ${ld_default:=$cc}
: ${host_ld_default:=$host_cc}
-set_default ar as dep_cc ld host_ld
+set_default as dep_cc ld host_ld
probe_cc as "$as"
asflags_filter=$_flags_filter
@@ -2701,17 +2701,6 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then
DEPCCFLAGS=$_flags
fi
-if $ar 2>&1 | grep -q Microsoft; then
- arflags="-nologo"
- ar_o='-out:$@'
-elif $ar 2>&1 | grep -q 'Texas Instruments'; then
- arflags="rq"
- ar_o='$@'
-else
- arflags="rc"
- ar_o='$@'
-fi
-
add_cflags $extra_cflags
add_asflags $extra_cflags
@@ -3322,7 +3311,18 @@ echo "config:$arch:$subarch:$cpu:$target_os:$(esc
$cc_ident):$(esc $LIBAV_CONFIG
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) ||
defined(PIC)" && enable_weak pic
set_default $PATHS_LIST
-set_default nm
+set_default ar nm
+
+if $ar 2>&1 | grep -q Microsoft; then
+ arflags="-nologo"
+ ar_o='-out:$@'
+elif $ar 2>&1 | grep -q 'Texas Instruments'; then
+ arflags="rq"
+ ar_o='$@'
+else
+ arflags="rc"
+ ar_o='$@'
+fi
# we need to build at least one lib type
if ! enabled_any static shared; then
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
