Mercurial > hg > nginx
annotate auto/lib/md5/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 |
| rev | line source |
|---|---|
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
1 |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
4 |
|
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
| 467 | 6 case "$NGX_CC_NAME" in |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
7 |
|
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
8 msvc) |
| 467 | 9 ngx_makefile=makefile.msvc |
| 503 | 10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM" |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
11 ngx_md5="MD5=\"$MD5\"" |
|
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
12 ;; |
|
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
13 |
|
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
14 owc) |
| 467 | 15 ngx_makefile=makefile.owc |
| 503 | 16 ngx_opt="CPU_OPT=\"$CPU_OPT\"" |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
17 ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
18 ;; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
19 |
| 467 | 20 bcc) |
| 21 ngx_makefile=makefile.bcc | |
| 503 | 22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM" |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
23 ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
24 ;; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
25 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
26 esac |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
27 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
28 |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
29 done=NO |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
30 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
31 |
| 493 | 32 case "$NGX_PLATFORM" in |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
33 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
34 win32) |
| 467 | 35 cat << END >> $NGX_MAKEFILE |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
36 |
| 467 | 37 `echo "$MD5/md5.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"` |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
38 \$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5 |
| 467 | 39 |
| 40 END | |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
41 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
42 done=YES |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
43 ;; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
273
diff
changeset
|
44 |
|
283
8f65fee68270
nginx-0.0.2-2004-03-10-20:55:19 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
45 SunOS:*:i86pc) |
|
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
46 if [ $MD5_ASM = YES ]; then |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
47 |
| 467 | 48 cat << END >> $NGX_MAKEFILE |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
49 |
| 467 | 50 $MD5/libmd5.a: $NGX_MAKEFILE |
| 51 cd $MD5 \\ | |
| 52 && \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\ | |
| 53 CC="\$(CC)" CPP="\$(CPP)" \\ | |
| 54 MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a | |
| 55 | |
| 56 END | |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
57 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
58 done=YES |
|
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
59 fi |
|
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
60 ;; |
|
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
61 |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
62 # FreeBSD: i386 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
63 # Linux: i686 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
64 |
|
285
8f48e6366d09
nginx-0.0.2-2004-03-11-18:42:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
284
diff
changeset
|
65 *:i386 | *:i686) |
|
284
1fecc9478d92
nginx-0.0.2-2004-03-10-23:56:39 import
Igor Sysoev <igor@sysoev.ru>
parents:
283
diff
changeset
|
66 if [ $MD5_ASM = YES ]; then |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
67 |
| 467 | 68 cat << END >> $NGX_MAKEFILE |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
69 |
| 467 | 70 $MD5/libmd5.a: $NGX_MAKEFILE |
| 71 cd $MD5 \\ | |
| 72 && \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\ | |
| 73 CC="\$(CC)" CPP="\$(CPP)" \\ | |
| 74 MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a | |
| 75 | |
| 76 END | |
|
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
77 |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
78 done=YES |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
79 fi |
|
273
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
80 ;; |
|
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
81 |
|
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
82 esac |
|
34329e143004
nginx-0.0.2-2004-03-01-19:45:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
83 |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
84 |
|
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
85 if [ $done = NO ]; then |
| 467 | 86 |
| 87 cat << END >> $NGX_MAKEFILE | |
| 88 | |
| 89 $MD5/libmd5.a: $NGX_MAKEFILE | |
| 90 cd $MD5 \\ | |
| 91 && \$(MAKE) CFLAGS="$MD5_OPT" \\ | |
| 92 CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a | |
| 93 | |
| 94 END | |
| 95 | |
|
286
fc8dc489247e
nginx-0.0.2-2004-03-12-00:34:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
285
diff
changeset
|
96 fi |