summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-18 21:32:57 +0000
committerMåns Rullgård <mans@mansr.com>2010-01-18 21:32:57 +0000
commit5d54c12611ec11a02f49574013d83ce148b39347 (patch)
treefbfc4de2ec687ac46cf35b6c1458fc3b9294121d /configure
parentbffe82f504622c56a41918b5a5e06cf0826d6953 (diff)
configure: fix cpu=generic case
Originally committed as revision 21300 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 3 insertions, 7 deletions
diff --git a/configure b/configure
index 6e1348893b..461c1b9524 100755
--- a/configure
+++ b/configure
@@ -1815,7 +1815,9 @@ is_in $arch $ARCH_LIST || echo "WARNING: unknown arch $arch"
enable $arch
# Add processor-specific flags
-if enabled ppc; then
+if test "$cpu" = generic; then
+ : do nothing
+elif enabled ppc; then
case $cpu in
601|ppc601|PowerPC601)
@@ -1923,12 +1925,6 @@ elif enabled avr32; then
;;
esac
-else
-
- if test "$cpu" != generic; then
- echo "WARNING: Unknown CPU \"$cpu\", ignored."
- fi
-
fi
add_cflags $cpuflags