OSDN Git Service

configure: fix cpu=generic case
authorMåns Rullgård <mans@mansr.com>
Mon, 18 Jan 2010 21:32:57 +0000 (21:32 +0000)
committerMåns Rullgård <mans@mansr.com>
Mon, 18 Jan 2010 21:32:57 +0000 (21:32 +0000)
Originally committed as revision 21300 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

index 6e13488..461c1b9 100755 (executable)
--- 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