Skip to content
Snippets Groups Projects
Commit 270739bb authored by Måns Rullgård's avatar Måns Rullgård
Browse files

move arch processing after command line loop

Originally committed as revision 8008 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4ec9ec81
No related branches found
No related tags found
No related merge requests found
......@@ -677,61 +677,6 @@ dcbzl="no"
mmi="default"
bigendian="no"
case "$arch" in
i386|i486|i586|i686|i86pc|BePC)
arch="x86_32"
;;
x86_64|amd64)
arch="x86_32"
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
arch="x86_64"
fi
fi
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
arch="armv4l"
;;
alpha)
arch="alpha"
;;
"Power Macintosh"|ppc|ppc64|powerpc)
arch="powerpc"
;;
mips|mipsel|IP*)
arch="mips"
;;
sun4u|sparc64)
arch="sparc64"
;;
sparc)
arch="sparc"
;;
sh4)
arch="sh4"
;;
parisc|parisc64)
arch="parisc"
;;
s390|s390x)
arch="s390"
;;
m68k)
arch="m68k"
;;
ia64)
arch="ia64"
;;
bfin)
arch="bfin"
;;
*)
arch="unknown"
;;
esac
# OS
targetos=`uname -s`
beos_netserver="no"
......@@ -936,6 +881,61 @@ for opt do
esac
done
case "$arch" in
i386|i486|i586|i686|i86pc|BePC)
arch="x86_32"
;;
x86_64|amd64)
arch="x86_32"
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
arch="x86_64"
fi
fi
;;
# armv4l is a subset of armv[567]*l
arm|armv[4567]*l)
arch="armv4l"
;;
alpha)
arch="alpha"
;;
"Power Macintosh"|ppc|ppc64|powerpc)
arch="powerpc"
;;
mips|mipsel|IP*)
arch="mips"
;;
sun4u|sparc64)
arch="sparc64"
;;
sparc)
arch="sparc"
;;
sh4)
arch="sh4"
;;
parisc|parisc64)
arch="parisc"
;;
s390|s390x)
arch="s390"
;;
m68k)
arch="m68k"
;;
ia64)
arch="ia64"
;;
bfin)
arch="bfin"
;;
*)
arch="unknown"
;;
esac
# OS specific
osextralibs="-lm"
case $targetos in
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment