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)
commit1904704a48b7ced8d5bb9091fe47a28b4bbe619b
treeabb8f01d10e35d98037605f34c6978db3f3e7bcd
parentb37852c7d9bc81dface8c8b4143301af914ef9a4
parentfaab8f9fcb4ffeb967dc6872c0f1e9da719106ce
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'

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

Conflicts:
configure

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