Commit 77273456 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '08b94f16'

* commit '08b94f16':
  configure: Don't pass MSVC compiler options -M[TD] to armasm
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d177f275 08b94f16
...@@ -3104,6 +3104,17 @@ EOF ...@@ -3104,6 +3104,17 @@ EOF
die "Sanity test failed." die "Sanity test failed."
fi 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(){ ccc_flags(){
for flag; do for flag; do
case $flag in case $flag in
...@@ -3397,6 +3408,7 @@ probe_cc(){ ...@@ -3397,6 +3408,7 @@ probe_cc(){
_ident=$($_cc | head -n1) _ident=$($_cc | head -n1)
# 4509: "This form of conditional instruction is deprecated" # 4509: "This form of conditional instruction is deprecated"
_flags="-nologo -ignore 4509" _flags="-nologo -ignore 4509"
_flags_filter=armasm_flags
elif $_cc 2>&1 | grep -q Microsoft; then elif $_cc 2>&1 | grep -q Microsoft; then
_type=msvc _type=msvc
_ident=$($cc 2>&1 | head -n1) _ident=$($cc 2>&1 | head -n1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment