aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-12-03 19:21:42 +0000
committerMans Rullgard <mans@mansr.com>2012-12-07 16:54:03 +0000
commit9ebd45c2d58ad9241ad09718679f0cf7fb57da52 (patch)
tree5230126626d13705b27d671cf5f47663910cf880
parentc29d49c1b3c8ad15955bf0638b51ea752df5ea37 (diff)
downloadffmpeg-9ebd45c2d58ad9241ad09718679f0cf7fb57da52.tar.gz
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@mansr.com>
-rwxr-xr-xconfigure11
1 files changed, 5 insertions, 6 deletions
diff --git a/configure b/configure
index fbfafe032b..0c13619885 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