diff options
author | Janne Grunau <j@jannau.net> | 2015-02-26 21:54:55 +0100 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2015-03-16 11:55:47 +0100 |
commit | faab8f9fcb4ffeb967dc6872c0f1e9da719106ce (patch) | |
tree | 231aefb863d76c7ed6e11b880437035c87ea2090 | |
parent | 3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea (diff) | |
download | ffmpeg-faab8f9fcb4ffeb967dc6872c0f1e9da719106ce.tar.gz |
configure: move cross_compile checks after the toolchain section
-rwxr-xr-x | configure | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -2494,13 +2494,6 @@ disabled logging && logfile=/dev/null echo "# $0 $LIBAV_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 - case "$toolchain" in clang-asan) cc_default="clang" @@ -2585,6 +2578,13 @@ 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 + ar_default="${cross_prefix}${ar_default}" cc_default="${cross_prefix}${cc_default}" nm_default="${cross_prefix}${nm_default}" |