ffmpeg | branch: master | Luca Barbato <lu_z...@gentoo.org> | Mon Apr 7 00:47:42 2014 +0200| [82b6e451161f19ab90bfb9565b710021caf5dcbd] | committer: Luca Barbato
configure: Move the cross_prefix setting after the toolchain one Makes passing to configure --toolchain=gcc-asan --cross-prefix=armv7a-hardfloat-linux-gnueabi- work as intended. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82b6e451161f19ab90bfb9565b710021caf5dcbd --- configure | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index c1d673c..13245f7 100755 --- a/configure +++ b/configure @@ -2494,15 +2494,6 @@ if enabled cross_compile; then die "Must specify target arch and OS when cross-compiling" fi -ar_default="${cross_prefix}${ar_default}" -cc_default="${cross_prefix}${cc_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" - case "$toolchain" in clang-asan) cc_default="clang" @@ -2587,6 +2578,15 @@ case "$toolchain" in ;; esac +ar_default="${cross_prefix}${ar_default}" +cc_default="${cross_prefix}${cc_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 enabled cross_compile || host_cc_default=$cc set_default host_cc _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
