PR #20156 opened by quink
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20156
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20156.patch
The copyright message of cl.exe doesn't always begin with Microsoft,
e.g., when local is Chinese.
Fix regression since 53da090ab7b.
>From ab2596863dd0808422a6313b28d02fc2a1197fe1 Mon Sep 17 00:00:00 2001
From: Zhao Zhili <zhiliz...@tencent.com>
Date: Thu, 7 Aug 2025 21:47:21 +0800
Subject: [PATCH] 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 53da090ab7b.
---
configure | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 30e61c5bb5..712ed947ff 100755
--- a/configure
+++ b/configure
@@ -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
--
2.49.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
