Mercurial > hg > nginx

comparison auto/lib/openssl/make @ 8129:3c4d81ea1338

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win32: OpenSSL compilation for x64 targets with MSVC. To ensure proper target selection the NGX_MACHINE variable is now set based on the MSVC compiler output, and the OpenSSL target is set based on it. This is not important as long as "no-asm" is used (as in misc/GNUmakefile and win32 build instructions), but might be beneficial if someone is trying to build OpenSSL with assembler code.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 23 Feb 2023 18:16:08 +0300
parents b329c0ab1a48
children
comparison
equal deleted inserted replaced
8128:79c04253bc43 8129:3c4d81ea1338
5 5
6 case "$CC" in 6 case "$CC" in
7 7
8 cl) 8 cl)
9 9
10 case "$NGX_MACHINE" in
11
12 amd64)
13 OPENSSL_TARGET=VC-WIN64A
14 ;;
15
16 *)
17 OPENSSL_TARGET=VC-WIN32
18 ;;
19
20 esac
21
10 cat << END >> $NGX_MAKEFILE 22 cat << END >> $NGX_MAKEFILE
11 23
12 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE 24 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
13 \$(MAKE) -f auto/lib/openssl/makefile.msvc \ 25 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
14 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT" 26 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT" \
27 OPENSSL_TARGET="$OPENSSL_TARGET"
15 28
16 END 29 END
17 30
18 ;; 31 ;;
19 32