Mercurial > hg > nginx-quic
comparison auto/lib/sha1/make @ 6397:78f8ac479735
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 13 Feb 2016 06:47:34 +0300 |
parents | d620f497c50f |
children |
comparison
equal
deleted
inserted
replaced
6396:dcfe355dfda4 | 6397:78f8ac479735 |
---|---|
3 # Copyright (C) Nginx, Inc. | 3 # Copyright (C) Nginx, Inc. |
4 | 4 |
5 | 5 |
6 case "$NGX_CC_NAME" in | 6 case "$NGX_CC_NAME" in |
7 | 7 |
8 msvc*) | 8 msvc) |
9 ngx_makefile=makefile.msvc | 9 ngx_makefile=makefile.msvc |
10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM" | 10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM" |
11 ngx_sha1="SHA1=\"$SHA1\"" | 11 ngx_sha1="SHA1=\"$SHA1\"" |
12 ;; | 12 ;; |
13 | 13 |
14 owc*) | 14 owc) |
15 ngx_makefile=makefile.owc | 15 ngx_makefile=makefile.owc |
16 ngx_opt="CPU_OPT=\"$CPU_OPT\"" | 16 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
17 ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` | 17 ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
18 ;; | 18 ;; |
19 | 19 |