[FFmpeg-cvslog] configure: move cross_compile checks after the toolchain section

Janne Grunau git at videolan.org
Mon Mar 16 21:53:33 CET 2015


ffmpeg | branch: master | Janne Grunau <j at jannau.net> | Thu Feb 26 21:54:55 2015 +0100| [faab8f9fcb4ffeb967dc6872c0f1e9da719106ce] | committer: Janne Grunau

configure: move cross_compile checks after the toolchain section

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=faab8f9fcb4ffeb967dc6872c0f1e9da719106ce
---

 configure |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 5eef9f1..7340844 100755
--- a/configure
+++ b/configure
@@ -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}"



More information about the ffmpeg-cvslog mailing list