Mercurial > hg > nginx-quic

comparison auto/cc/name @ 4249:e648bb470e12 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4155, r4219, r4220, r4230: Windows related fixes: *) Fixed segmentation fault with empty config on Windows. See here for report: http://mailman.nginx.org/pipermail/nginx-ru/2011-September/043288.html *) Recent SDKs allow to build IPV6 only for Windows XP or above. *) Fixing conflict with SDK off_t definition. *) Fix of building by Microsoft Visual C++ 10 compiler.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 13:56:26 +0000
parents 7d125a707158
children d620f497c50f
comparison
equal deleted inserted replaced
4248:2fad4d19ea4b 4249:e648bb470e12
23 fi 23 fi
24 24
25 25
26 if [ "$CC" = cl ]; then 26 if [ "$CC" = cl ]; then
27 if `$NGX_WINE $CC -v 2>&1 \ 27 if `$NGX_WINE $CC -v 2>&1 \
28 | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16' \
29 >/dev/null 2>&1`; then
30
31 NGX_CC_NAME=msvc10
32 echo " + using Microsoft Visual C++ 10 compiler"
33
34 else if `$NGX_WINE $CC -v 2>&1 \
28 | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \ 35 | grep '^Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 14' \
29 >/dev/null 2>&1`; then 36 >/dev/null 2>&1`; then
30 37
31 NGX_CC_NAME=msvc8 38 NGX_CC_NAME=msvc8
32 echo " + using Microsoft Visual C++ 8 compiler" 39 echo " + using Microsoft Visual C++ 8 compiler"
39 echo " + using Microsoft Visual C++ 7 compiler" 46 echo " + using Microsoft Visual C++ 7 compiler"
40 47
41 else 48 else
42 NGX_CC_NAME=msvc 49 NGX_CC_NAME=msvc
43 echo " + using Microsoft Visual C++ compiler" 50 echo " + using Microsoft Visual C++ compiler"
51 fi
44 fi 52 fi
45 fi 53 fi
46 54
47 else 55 else
48 if [ "$CC" = wcl386 ]; then 56 if [ "$CC" = wcl386 ]; then