# HG changeset patch # User Maxim Dounin <mdou...@mdounin.ru> # Date 1671541078 -10800 # Tue Dec 20 15:57:58 2022 +0300 # Node ID 43098cb134a87a404b70fcc77ad01ca343cba969 # Parent f5d9c24fb4ac2a6b82b9d842b88978a329690138 Win32: handling of localized MSVC cl output.
Output examples in English, Russian, and Spanish: Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86 Оптимизирующий 32-разрядный компилятор Microsoft (R) C/C++ версии 16.00.30319.01 для 80x86 Compilador de optimización de C/C++ de Microsoft (R) versión 16.00.30319.01 para x64 Since most of the words are translated, instead of looking for the words "Compiler Version" we now search for "C/C++" and the version number. diff -r f5d9c24fb4ac -r 43098cb134a8 auto/cc/msvc --- a/auto/cc/msvc Tue Dec 20 15:57:51 2022 +0300 +++ b/auto/cc/msvc Tue Dec 20 15:57:58 2022 +0300 @@ -11,8 +11,8 @@ # MSVC 2015 (14.0) cl 19.00 -NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'Compiler Version' 2>&1 \ - | sed -e 's/^.* Version \(.*\)/\1/'` +NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'C/C++.* [0-9][0-9]*\.[0-9]' 2>&1 \ + | sed -e 's/^.* \([0-9][0-9]*\.[0-9].*\)/\1/'` echo " + cl version: $NGX_MSVC_VER" _______________________________________________ nginx-devel mailing list nginx-devel@nginx.org https://mailman.nginx.org/mailman/listinfo/nginx-devel
