Mercurial > hg > nginx
annotate 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 |
| rev | line source |
|---|---|
| 653 | 1 |
| 2 # Copyright (C) Igor Sysoev | |
| 4412 | 3 # Copyright (C) Nginx, Inc. |
| 653 | 4 |
| 5 | |
| 6 case "$NGX_CC_NAME" in | |
| 7 | |
|
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
8 msvc) |
| 653 | 9 ngx_makefile=makefile.msvc |
| 10 ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM" | |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
11 ngx_sha1="SHA1=\"$SHA1\"" |
| 653 | 12 ;; |
| 13 | |
|
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
14 owc) |
| 653 | 15 ngx_makefile=makefile.owc |
| 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_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 653 | 18 ;; |
| 19 | |
| 20 bcc) | |
| 21 ngx_makefile=makefile.bcc | |
| 22 ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM" | |
|
2838
ecdc41bf2047
backout r2833: CURDIR was set to Unix style path
Igor Sysoev <igor@sysoev.ru>
parents:
2832
diff
changeset
|
23 ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"` |
| 653 | 24 ;; |
| 25 | |
| 26 esac | |
| 27 | |
| 28 | |
| 29 done=NO | |
| 30 | |
| 31 | |
| 32 case "$NGX_PLATFORM" in | |
| 33 | |
| 34 win32) | |
| 35 cat << END >> $NGX_MAKEFILE | |
| 36 | |
| 37 `echo "$SHA1/sha1.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/sha1/$ngx_makefile $ngx_opt $ngx_sha1 |
| 653 | 39 |
| 40 END | |
| 41 | |
| 42 done=YES | |
| 43 ;; | |
| 44 | |
| 45 SunOS:*:i86pc) | |
| 46 if [ $SHA1_ASM = YES ]; then | |
| 47 | |
| 48 cat << END >> $NGX_MAKEFILE | |
| 49 | |
| 50 $SHA1/libsha.a: $NGX_MAKEFILE | |
| 51 cd $SHA1 \\ | |
| 52 && \$(MAKE) CFLAGS="$SHA1_OPT -DSOL -DSHA1_ASM -DL_ENDIAN" \\ | |
| 53 CC="\$(CC)" CPP="\$(CPP)" \\ | |
| 54 SHA_ASM_OBJ=asm/sx86-sol.o clean libsha.a | |
| 55 | |
| 56 END | |
| 57 | |
| 58 done=YES | |
| 59 fi | |
| 60 ;; | |
| 61 | |
| 62 # FreeBSD: i386 | |
| 63 # Linux: i686 | |
| 64 | |
| 65 *:i386 | *:i686) | |
| 66 if [ $SHA1_ASM = YES ]; then | |
| 67 | |
| 68 cat << END >> $NGX_MAKEFILE | |
| 69 | |
| 70 $SHA1/libsha.a: $NGX_MAKEFILE | |
| 71 cd $SHA1 \\ | |
| 72 && \$(MAKE) CFLAGS="$SHA1_OPT -DELF -DSHA1_ASM -DL_ENDIAN" \\ | |
| 73 CC="\$(CC)" CPP="\$(CPP)" \\ | |
| 74 SHA_ASM_OBJ=asm/sx86-elf.o clean libsha.a | |
| 75 | |
| 76 END | |
| 77 | |
| 78 done=YES | |
| 79 fi | |
| 80 ;; | |
| 81 | |
| 82 esac | |
| 83 | |
| 84 | |
| 85 if [ $done = NO ]; then | |
| 86 | |
| 87 cat << END >> $NGX_MAKEFILE | |
| 88 | |
| 89 $SHA1/libsha.a: $NGX_MAKEFILE | |
| 90 cd $SHA1 \\ | |
| 91 && \$(MAKE) CFLAGS="$SHA1_OPT" \\ | |
| 92 CC="\$(CC)" SHA_ASM_OBJ= clean libsha.a | |
| 93 | |
| 94 END | |
| 95 | |
| 96 fi |