summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 23:47:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 23:47:48 +0200
commit77273456137f1799e6eb2066a4d767b553568aba (patch)
treef7fe00c12664b028c0a39800a17b4b1a1aa6bcf8 /configure
parentd177f275170c968837dc0c00bc1f1f3b59426e93 (diff)
parent08b94f160a2c966bb83e32bde0e52246fafa2155 (diff)
downloadffmpeg-streaming-77273456137f1799e6eb2066a4d767b553568aba.zip
ffmpeg-streaming-77273456137f1799e6eb2066a4d767b553568aba.tar.gz
Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'
* commit '08b94f160a2c966bb83e32bde0e52246fafa2155': configure: Don't pass MSVC compiler options -M[TD] to armasm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 12 insertions, 0 deletions
diff --git a/configure b/configure
index bc27fb0..0ac6132 100755
--- a/configure
+++ b/configure
@@ -3104,6 +3104,17 @@ EOF
die "Sanity test failed."
fi
+armasm_flags(){
+ for flag; do
+ case $flag in
+ # Filter out MSVC cl.exe options from cflags that shouldn't
+ # be passed to gas-preprocessor
+ -M[TD]*) ;;
+ *) echo $flag ;;
+ esac
+ done
+}
+
ccc_flags(){
for flag; do
case $flag in
@@ -3397,6 +3408,7 @@ probe_cc(){
_ident=$($_cc | head -n1)
# 4509: "This form of conditional instruction is deprecated"
_flags="-nologo -ignore 4509"
+ _flags_filter=armasm_flags
elif $_cc 2>&1 | grep -q Microsoft; then
_type=msvc
_ident=$($cc 2>&1 | head -n1)
OpenPOWER on IntegriCloud