Before the prefix was silently dropped if --toolchain was specified.
Signed-off-by: Reimar Döffinger <reimar.doeffin...@gmx.de>
---
configure | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/configure b/configure
index 5c1cbca..1aaadd4 100755
--- a/configure
+++ b/configure
@@ -2975,24 +2975,6 @@ disabled logging && logfile=/dev/null
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
set >> $logfile
-test -n "$cross_prefix" && enable cross_compile
-
-if enabled cross_compile; then
- test -n "$arch" && test -n "$target_os" ||
- die "Must specify target arch and OS when cross-compiling"
-fi
-
-test -n "$cross_prefix" || cross_prefix="$toolchain_prefix"
-
-ar_default="${cross_prefix}${ar_default}"
-cc_default="${cross_prefix}${cc_default}"
-cxx_default="${cross_prefix}${cxx_default}"
-nm_default="${cross_prefix}${nm_default}"
-pkg_config_default="${cross_prefix}${pkg_config_default}"
-ranlib_default="${cross_prefix}${ranlib_default}"
-strip_default="${cross_prefix}${strip_default}"
-windres_default="${cross_prefix}${windres_default}"
-
sysinclude_default="${sysroot}/usr/include"
test -n "$valgrind" && toolchain="valgrind-memcheck"
@@ -3081,6 +3063,24 @@ case "$toolchain" in
;;
esac
+test -n "$cross_prefix" && enable cross_compile
+
+if enabled cross_compile; then
+ test -n "$arch" && test -n "$target_os" ||
+ die "Must specify target arch and OS when cross-compiling"
+fi
+
+test -n "$cross_prefix" || cross_prefix="$toolchain_prefix"
+
+ar_default="${cross_prefix}${ar_default}"
+cc_default="${cross_prefix}${cc_default}"
+cxx_default="${cross_prefix}${cxx_default}"
+nm_default="${cross_prefix}${nm_default}"
+pkg_config_default="${cross_prefix}${pkg_config_default}"
+ranlib_default="${cross_prefix}${ranlib_default}"
+strip_default="${cross_prefix}${strip_default}"
+windres_default="${cross_prefix}${windres_default}"
+
set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
target_exec target_os yasmexe
host_cc_default=${toolchain_prefix}${host_cc_default}
--
2.2.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
