mirror of https://github.com/mpv-player/mpv
Move 64 bit check below compiler detection since it needs the compiler
and obviously should use the one that will be used for compiling in the end. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29797 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
1198f65d0b
commit
406c8a2b5b
|
@ -1520,19 +1520,6 @@ echo configuration: $_configuration > "$TMPLOG"
|
||||||
echo >> "$TMPLOG"
|
echo >> "$TMPLOG"
|
||||||
|
|
||||||
|
|
||||||
if test -z "$_target" && x86 ; then
|
|
||||||
cat > $TMPC << EOF
|
|
||||||
int main(void) {
|
|
||||||
int test[sizeof(char *)-7];
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
cc_check && host_arch=x86_64 || host_arch=i386
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Detected operating system: $system_name"
|
|
||||||
echo "Detected host architecture: $host_arch"
|
|
||||||
|
|
||||||
if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then
|
if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then
|
||||||
die "Runtime CPU detection only works for x86, x86-64 and PPC!"
|
die "Runtime CPU detection only works for x86, x86-64 and PPC!"
|
||||||
fi
|
fi
|
||||||
|
@ -1587,6 +1574,19 @@ else
|
||||||
fi # icc
|
fi # icc
|
||||||
test "$cc_fail" = yes && die "unsupported compiler version"
|
test "$cc_fail" = yes && die "unsupported compiler version"
|
||||||
|
|
||||||
|
if test -z "$_target" && x86 ; then
|
||||||
|
cat > $TMPC << EOF
|
||||||
|
int main(void) {
|
||||||
|
int test[sizeof(char *)-7];
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
cc_check && host_arch=x86_64 || host_arch=i386
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Detected operating system: $system_name"
|
||||||
|
echo "Detected host architecture: $host_arch"
|
||||||
|
|
||||||
echocheck "host cc"
|
echocheck "host cc"
|
||||||
test "$_host_cc" || _host_cc=$_cc
|
test "$_host_cc" || _host_cc=$_cc
|
||||||
echores $_host_cc
|
echores $_host_cc
|
||||||
|
|
Loading…
Reference in New Issue