[FFmpeg-cvslog] configure: do not bypass cpuflags section if --cpu not given

Mans Rullgard git at videolan.org
Sat Dec 8 13:55:35 CET 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Dec  3 19:21:42 2012 +0000| [9ebd45c2d58ad9241ad09718679f0cf7fb57da52] | committer: Mans Rullgard

configure: do not bypass cpuflags section if --cpu not given

This will allow arch-specific ways of determining the target
variant when none is specified on the command line.

Signed-off-by: Mans Rullgard <mans at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ebd45c2d58ad9241ad09718679f0cf7fb57da52
---

 configure |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index fbfafe0..0c13619 100755
--- a/configure
+++ b/configure
@@ -2524,10 +2524,7 @@ is_in $arch $ARCH_LIST || warn "unknown architecture $arch"
 enable $arch
 
 # Add processor-specific flags
-if test "$cpu" = generic; then
-    : do nothing
-
-elif enabled aarch64; then
+if enabled aarch64; then
 
     case $cpu in
         armv*)
@@ -2680,8 +2677,10 @@ elif enabled x86; then
 
 fi
 
-add_cflags $cpuflags
-add_asflags $cpuflags
+if [ "$cpu" != generic ]; then
+    add_cflags  $cpuflags
+    add_asflags $cpuflags
+fi
 
 # compiler sanity check
 check_exec <<EOF



More information about the ffmpeg-cvslog mailing list