Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155'
* commit '08b94f160a2c966bb83e32bde0e52246fafa2155': configure: Don't pass MSVC compiler options -M[TD] to armasm Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7727345613
12
configure
vendored
12
configure
vendored
@ -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(){
|
|||||||
_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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user