Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:46:02 +0000 (21:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Mar 2015 20:46:02 +0000 (21:46 +0100)
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
  configure: move cross_compile checks after the toolchain section

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
  
  disabled logging && logfile=/dev/null
  
 -echo "# $0 $LIBAV_CONFIGURATION" > $logfile
 +echo "# $0 $FFMPEG_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
 +test -n "$valgrind" && toolchain="valgrind-memcheck"
 +
  case "$toolchain" in
      clang-asan)
          cc_default="clang"
      ;;
  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}"
 +cxx_default="${cross_prefix}${cxx_default}"
  nm_default="${cross_prefix}${nm_default}"
  pkg_config_default="${cross_prefix}${pkg_config_default}"
 -ranlib="${cross_prefix}${ranlib}"
 -strip="${cross_prefix}${strip}"
 +ranlib_default="${cross_prefix}${ranlib_default}"
 +strip_default="${cross_prefix}${strip_default}"
 +windres_default="${cross_prefix}${windres_default}"
  
  sysinclude_default="${sysroot}/usr/include"