You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
configure: Fix build with MSVC
The copyright message of cl.exe doesn't always begin with Microsoft,
e.g., when local is Chinese.
Fix regression since 53da090ab7
.
This commit is contained in:
committed by
Kacper Michajłow
parent
85a2beaa81
commit
7f150dc4b7
8
configure
vendored
8
configure
vendored
@@ -5158,12 +5158,12 @@ probe_cc(){
|
||||
_flags_filter=msvc_flags
|
||||
_ld_lib='lib%.a'
|
||||
_ld_path='-libpath:'
|
||||
elif $_cc -nologo- 2>&1 | grep -q ^Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
|
||||
elif VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
|
||||
_type=msvc
|
||||
if $_cc -nologo- 2>&1 | grep -q ^Microsoft; then
|
||||
if VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft; then
|
||||
# Depending on the tool (cl.exe or link.exe), the version number
|
||||
# is printed on the first line of stderr or stdout
|
||||
_ident=$($_cc 2>&1 | grep ^Microsoft | head -n1 | tr -d '\r')
|
||||
_ident=$(VSLANG=1033 $_cc 2>&1 | grep ^Microsoft | head -n1 | tr -d '\r')
|
||||
else
|
||||
_ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
|
||||
fi
|
||||
@@ -5273,7 +5273,7 @@ if [ -z "$CC_DEPFLAGS" ] && [ "$dep_cc" != "$cc" ]; then
|
||||
DEPCCFLAGS=$_flags
|
||||
fi
|
||||
|
||||
if $ar 2>&1 | grep -q ^Microsoft; then
|
||||
if VSLANG=1033 $ar 2>&1 | grep -q ^Microsoft; then
|
||||
arflags="-nologo"
|
||||
ar_o='-out:$@'
|
||||
elif $ar 2>&1 | grep -q "\[D\] "; then
|
||||
|
Reference in New Issue
Block a user