Mercurial > mplayer.hg
changeset 33799:6a9627d6f8f1
configure: use 'uname -m' to find out host architecture
Before 'uname -m' was only the fallback after trying 'uname -p', but the
former is more reliable across platforms, so just use it directly.
This should hopefully address Bugzilla #1560.
| author | diego |
|---|---|
| date | Thu, 21 Jul 2011 01:21:36 +0000 |
| parents | 2a145501610c |
| children | 844786b8f768 |
| files | configure |
| diffstat | 1 files changed, 1 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Jul 21 01:21:34 2011 +0000 +++ b/configure Thu Jul 21 01:21:36 2011 +0000 @@ -1466,21 +1466,7 @@ # host's CPU/instruction set - host_arch=$(uname -p 2>&1) - case "$host_arch" in - i386|sparc|ppc|alpha|arm|mips|vax) - ;; - powerpc) # Darwin returns 'powerpc' - host_arch=ppc - ;; - *) # uname -p on Linux returns 'unknown' for the processor type, - # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)' - - # Maybe uname -m (machine hardware name) returns something we - # recognize. - - # x86/x86pc is used by QNX - case "$(uname -m 2>&1)" in + case "$(uname -m 2>&1)" in x86_64|amd64|i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;; ia64) host_arch=ia64 ;; macppc|ppc) host_arch=ppc ;; @@ -1497,8 +1483,6 @@ vax) host_arch=vax ;; xtensa*) host_arch=xtensa ;; *) host_arch=UNKNOWN ;; - esac - ;; esac else # if test -z "$_target" system_name=$(echo $_target | cut -d '-' -f 2)