Mercurial > mplayer.hg
comparison configure @ 35321:fbcd69bb7d02
Move runtime cpu detection support until after we determined
the target architecture.
| author | reimar |
|---|---|
| date | Sat, 10 Nov 2012 16:05:12 +0000 |
| parents | 2ea8746871f2 |
| children | 5265ba612957 |
comparison
equal
deleted
inserted
replaced
| 35320:2ea8746871f2 | 35321:fbcd69bb7d02 |
|---|---|
| 1649 rm -f "$TMPLOG" | 1649 rm -f "$TMPLOG" |
| 1650 echo configuration: $configuration > "$TMPLOG" | 1650 echo configuration: $configuration > "$TMPLOG" |
| 1651 echo >> "$TMPLOG" | 1651 echo >> "$TMPLOG" |
| 1652 | 1652 |
| 1653 | 1653 |
| 1654 if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then | |
| 1655 die "Runtime CPU detection only works for x86, x86-64 and PPC!" | |
| 1656 fi | |
| 1657 | |
| 1658 | |
| 1659 # Checking CC version... | 1654 # Checking CC version... |
| 1660 # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure) | 1655 # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure) |
| 1661 if test "$(basename $_cc)" = "icc" || test "$(basename $_cc)" = "ecc"; then | 1656 if test "$(basename $_cc)" = "icc" || test "$(basename $_cc)" = "ecc"; then |
| 1662 echocheck "$_cc version" | 1657 echocheck "$_cc version" |
| 1663 cc_vendor=intel | 1658 cc_vendor=intel |
| 1748 fi | 1743 fi |
| 1749 fi | 1744 fi |
| 1750 | 1745 |
| 1751 echo "Detected operating system: $system_name" | 1746 echo "Detected operating system: $system_name" |
| 1752 echo "Detected host architecture: $host_arch" | 1747 echo "Detected host architecture: $host_arch" |
| 1748 | |
| 1749 if test "$_runtime_cpudetection" = yes && ! x86 && ! ppc; then | |
| 1750 die "Runtime CPU detection only works for x86, x86-64 and PPC!" | |
| 1751 fi | |
| 1753 | 1752 |
| 1754 echocheck "cross compilation" | 1753 echocheck "cross compilation" |
| 1755 if test $_cross_compile = auto ; then | 1754 if test $_cross_compile = auto ; then |
| 1756 _cross_compile=yes | 1755 _cross_compile=yes |
| 1757 cflag_check "" && "$TMPEXE" && _cross_compile=no | 1756 cflag_check "" && "$TMPEXE" && _cross_compile=no |