diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2023-02-23 18:15:57 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2023-02-23 18:15:57 +0300 |
| commit | 180be97d3157c6ed81efc0272dea6472241304c3 (patch) | |
| tree | 5f0d9034b8d51840ce408f1fed50a8d08beb57bd | |
| parent | 504ca566861dde3d20a558fc02c7066e9bb54bfd (diff) | |
| download | nginx-180be97d3157c6ed81efc0272dea6472241304c3.tar.gz | |
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.
| -rw-r--r-- | auto/cc/msvc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/auto/cc/msvc b/auto/cc/msvc index 68435ff48..d4c0be4c3 100644 --- a/auto/cc/msvc +++ b/auto/cc/msvc @@ -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" |