highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

Browse Source 
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-16 21:46:02 +01:00
parent b37852c7d9 faab8f9fcb
commit 1904704a48
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@@ -2995,13 +2995,6 @@ disabled logging && logfile=/dev/null
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
set >> $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 "$valgrind" && toolchain="valgrind-memcheck" test -n "$valgrind" && toolchain="valgrind-memcheck"
case "$toolchain" in case "$toolchain" in
@@ -3088,6 +3081,13 @@ case "$toolchain" in
;; ;;
esac 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
ar_default="${cross_prefix}${ar_default}" ar_default="${cross_prefix}${ar_default}"
cc_default="${cross_prefix}${cc_default}" cc_default="${cross_prefix}${cc_default}"
cxx_default="${cross_prefix}${cxx_default}" cxx_default="${cross_prefix}${cxx_default}"