diff options
author | Jacob Meuser <jakemsr@jakemsr.com> | 2005-05-10 08:30:36 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-10 08:30:36 +0000 |
commit | 7bf9648ebc7a8988f414ad284dab16ac9f55bfac (patch) | |
tree | 5dfd36af08b4c37bd914928fbaa842bd3d340bb7 | |
parent | 8c802695b9498d2cb80765c508c761f02061c8f5 (diff) | |
download | ffmpeg-7bf9648ebc7a8988f414ad284dab16ac9f55bfac.tar.gz |
amd64 as canonical system type patch by (Jacob Meuser <jakemsr jakemsr com )
Originally committed as revision 4209 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-x | configure | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -115,12 +115,13 @@ case "$cpu" in i386|i486|i586|i686|i86pc|BePC) cpu="x86" ;; - x86_64) - if [ "`$cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \ - -z "`echo $CFLAGS | grep -- -m32`" ]; then - cpu="x86_64" - else - cpu="x86" + x86_64|amd64) + cpu="x86" + canon_arch="`cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`" + if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then + if [ -z "`echo $CFLAGS | grep -- -m32`" ]; then + cpu="x86_64" + fi fi ;; # armv4l is a subset of armv5tel |