summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-01-31 19:36:16 +0100
committerUoti Urpala <uau@mplayer2.org>2012-02-29 23:49:43 +0200
commitcca0b196bac19dac82ba778ef5527ba0b9431925 (patch)
tree9e7b9d943bc667d3afd7a016e6ec19749473c6e3 /configure
parent75bc1591e8be6c4f39e67dcaff8f1564ff4ffd02 (diff)
downloadmpv-cca0b196bac19dac82ba778ef5527ba0b9431925.tar.bz2
mpv-cca0b196bac19dac82ba778ef5527ba0b9431925.tar.xz
configure: disable cross compilation auto detection
This didn't work very well when cross compiling from Linux to Windows: it tries to execute an .exe file, which succeeds if wine is installed. As consequence it detects "no" as result. In general this won't work if emulation for the target architecture is available. Remove it.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure
index b28b38d6d5..c5c99c7d33 100755
--- a/configure
+++ b/configure
@@ -476,7 +476,7 @@ Available values for --language-msg are: all $msg_lang_all
Miscellaneous options:
--enable-runtime-cpudetection enable runtime CPU detection [disable]
- --enable-cross-compile enable cross-compilation [autodetect]
+ --enable-cross-compile enable cross-compilation [disable]
--cc=COMPILER C compiler to build MPlayer [gcc]
--host-cc=COMPILER C compiler for tools needed while building [gcc]
--as=ASSEMBLER assembler to build MPlayer [as]
@@ -560,7 +560,7 @@ _as=auto
_nm=auto
_yasm=yasm
_runtime_cpudetection=no
-_cross_compile=auto
+_cross_compile=no
_prefix="/usr/local"
ffmpeg=auto
ffmpeg_internals=no
@@ -1478,9 +1478,10 @@ echo "Detected operating system: $system_name"
echo "Detected host architecture: $host_arch"
echocheck "cross compilation"
-if test $_cross_compile = auto ; then
+if test $_cross_compile = yes ; then
_cross_compile=yes
- cflag_check "" && "$TMPEXE" && _cross_compile=no
+else
+ _cross_compile=no
fi
echores $_cross_compile