RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-18 05:11:09 +00:00
Code Issues Projects Releases Wiki Activity

configure: move cross_compile checks after the toolchain section

Browse Source
This commit is contained in:
Janne Grunau 2015-02-26 21:54:55 +01:00 committed by Janne Grunau
parent 3e1b5cbc9a
commit faab8f9fcb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -2494,13 +2494,6 @@ disabled logging && logfile=/dev/null
echo "# $0 $LIBAV_CONFIGURATION" > $logfile echo "# $0 $LIBAV_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
case "$toolchain" in case "$toolchain" in
clang-asan) clang-asan)
cc_default="clang" cc_default="clang"
@ -2585,6 +2578,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}"
nm_default="${cross_prefix}${nm_default}" nm_default="${cross_prefix}${nm_default}"