From 18d1e66fcf920d51543c8b55f971a89871cd602d Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Tue, 22 Jun 2021 11:26:19 +0200 Subject: [PATCH] Tweak MSVC detection to work with non-English Visual Studio Fix #4699 Signed-off-by: Gilles Peskine --- scripts/mbedtls_dev/c_build_helper.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/mbedtls_dev/c_build_helper.py b/scripts/mbedtls_dev/c_build_helper.py index 18c1e7606..459afba42 100644 --- a/scripts/mbedtls_dev/c_build_helper.py +++ b/scripts/mbedtls_dev/c_build_helper.py @@ -135,8 +135,7 @@ def get_c_expression_values( stdout=subprocess.DEVNULL, stderr=subprocess.PIPE, universal_newlines=True) - cc_is_msvc = 'Microsoft (R) C/C++ Optimizing Compiler' in \ - proc.communicate()[1] + cc_is_msvc = 'Microsoft (R) C/C++' in proc.communicate()[1] cmd += ['-I' + dir for dir in include_path] if cc_is_msvc: