---
configure | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index 2477086799..bc989c8c49 100755
--- a/configure
+++ b/configure
@@ -3020,22 +3020,13 @@ case "$toolchain" in
;;
esac
-test -n "$cross_prefix" && enable cross_compile
-
-if enabled cross_compile; then
+if test -n "$cross_prefix"; then
test -n "$arch" && test -n "$target_os" ||
die "Must specify target arch (--arch) and OS (--target-os) when
cross-compiling"
+ enable cross_compile
+ map '$v="${cross_prefix}${v}"' ar_default cc_default objcc_default
x86asmexe_default nm_default pkg_config_default ranlib strip
fi
-ar_default="${cross_prefix}${ar_default}"
-cc_default="${cross_prefix}${cc_default}"
-objcc_default="${cross_prefix}${objcc_default}"
-x86asmexe_default="${cross_prefix}${x86asmexe_default}"
-nm_default="${cross_prefix}${nm_default}"
-pkg_config_default="${cross_prefix}${pkg_config_default}"
-ranlib="${cross_prefix}${ranlib}"
-strip="${cross_prefix}${strip}"
-
sysinclude_default="${sysroot}/usr/include"
set_default arch cc pkg_config sysinclude target_exec target_os x86asmexe
--
2.11.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
