diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-13 06:47:34 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-02-13 06:47:34 +0300 |
| commit | 4cfd9ba3c18932a47eca176a79da31455e444cc3 (patch) | |
| tree | 62f3402c03581ee03d136d53aa31f8f9be0a0f43 /auto/cc/name | |
| parent | 822fc91b093b85a94ca54fc8c7e2d85fc5a4daf8 (diff) | |
| download | nginx-4cfd9ba3c18932a47eca176a79da31455e444cc3.tar.gz nginx-4cfd9ba3c18932a47eca176a79da31455e444cc3.tar.bz2 | |
Win32: simplified and improved handling of MSVC versions.
Now we always set NGX_CC_NAME to "msvc", and additionally test compiler
version as reported by "cl" in auto/cc/msvc (the same version is also
available via the _MSC_VER define). In particular, this approach allows
to properly check for C99 variadic macros support, which previously was
not used with MSVC versions not explicitly recognized.
Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly,
as well as unused wildcards for owc and icc.
Diffstat (limited to '')
| -rw-r--r-- | auto/cc/name | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/auto/cc/name b/auto/cc/name index 51a7ed92e..35d319e61 100644 --- a/auto/cc/name +++ b/auto/cc/name @@ -25,31 +25,8 @@ fi if [ "$CC" = cl ]; then - if `$NGX_WINE $CC -v 2>&1 \ - | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16' \ - >/dev/null 2>&1`; then - - NGX_CC_NAME=msvc10 - echo " + using Microsoft Visual C++ 10 compiler" - - elif `$NGX_WINE $CC -v 2>&1 \ - | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \ - >/dev/null 2>&1`; then - - NGX_CC_NAME=msvc8 - echo " + using Microsoft Visual C++ 8 compiler" - - elif `$NGX_WINE $CC -v 2>&1 \ - | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 13' \ - >/dev/null 2>&1`; then - - NGX_CC_NAME=msvc7 - echo " + using Microsoft Visual C++ 7 compiler" - - else - NGX_CC_NAME=msvc - echo " + using Microsoft Visual C++ compiler" - fi + NGX_CC_NAME=msvc + echo " + using Microsoft Visual C++ compiler" elif [ "$CC" = wcl386 ]; then NGX_CC_NAME=owc |
