videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd' 

* commit '82b6e451161f19ab90bfb9565b710021caf5dcbd':
  configure: Move the cross_prefix setting after the toolchain one

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-26 19:36:28 +01:00
parent 43e5e3c077 82b6e45116
commit 51b7ab2ee7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -2996,17 +2996,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}"
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"
case "$toolchain" in
@ -3093,6 +3082,17 @@ case "$toolchain" in
;;
esac
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"
set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
target_exec target_os yasmexe
enabled cross_compile || host_cc_default=$cc