Mercurial > mplayer.hg
comparison configure @ 29755:3687c6de309f
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.
author | reimar |
---|---|
date | Mon, 26 Oct 2009 22:15:19 +0000 |
parents | 58e73accaeb7 |
children | 39265f6b07ef |
comparison
equal
deleted
inserted
replaced
29754:2fecfba6f36a | 29755:3687c6de309f |
---|---|
1518 rm -f "$TMPLOG" | 1518 rm -f "$TMPLOG" |
1519 echo configuration: $_configuration > "$TMPLOG" | 1519 echo configuration: $_configuration > "$TMPLOG" |
1520 echo >> "$TMPLOG" | 1520 echo >> "$TMPLOG" |
1521 | 1521 |
1522 | 1522 |
1523 if test -z "$_target" && x86 ; then | |
1524 cat > $TMPC << EOF | |
1525 int main(void) { | |
1526 int test[sizeof(char *)-7]; | |
1527 return 0; | |
1528 } | |
1529 EOF | |
1530 cc_check && host_arch=x86_64 || host_arch=i386 | |
1531 fi | |
1532 | |
1533 echo "Detected operating system: $system_name" | |
1534 echo "Detected host architecture: $host_arch" | |
1535 | |
1536 if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then | 1523 if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then |
1537 die "Runtime CPU detection only works for x86, x86-64 and PPC!" | 1524 die "Runtime CPU detection only works for x86, x86-64 and PPC!" |
1538 fi | 1525 fi |
1539 | 1526 |
1540 | 1527 |
1584 break | 1571 break |
1585 fi | 1572 fi |
1586 done | 1573 done |
1587 fi # icc | 1574 fi # icc |
1588 test "$cc_fail" = yes && die "unsupported compiler version" | 1575 test "$cc_fail" = yes && die "unsupported compiler version" |
1576 | |
1577 if test -z "$_target" && x86 ; then | |
1578 cat > $TMPC << EOF | |
1579 int main(void) { | |
1580 int test[sizeof(char *)-7]; | |
1581 return 0; | |
1582 } | |
1583 EOF | |
1584 cc_check && host_arch=x86_64 || host_arch=i386 | |
1585 fi | |
1586 | |
1587 echo "Detected operating system: $system_name" | |
1588 echo "Detected host architecture: $host_arch" | |
1589 | 1589 |
1590 echocheck "host cc" | 1590 echocheck "host cc" |
1591 test "$_host_cc" || _host_cc=$_cc | 1591 test "$_host_cc" || _host_cc=$_cc |
1592 echores $_host_cc | 1592 echores $_host_cc |
1593 | 1593 |