Browse Source

build: fix openssl link error on windows

This commit attempts to fix an issue when building on windows using the
following command line options:
.\vcbuild.bat dll debug x64 vc2015

This will result in the following options passed to configure:
configure --debug --shared --dest-cpu=x64 --tag=

This commit excludes the dependency to openssl if node is configured
with --shared.

Also, FP_API to the categories to export in mkssldef when generating
the module definition (openssl.def) allowing the build to compile and
link successfully.

Fixes: https://github.com/nodejs/node/issues/12952
PR-URL: https://github.com/nodejs/node/pull/13078
Backport-PR-URL: https://github.com/nodejs/node/pull/12948
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
v6.x
Daniel Bevenius 8 years ago
committed by Myles Borins
parent
commit
890e210a5f
No known key found for this signature in database GPG Key ID: 933B01F40B5CA946
  1. 4
      node.gyp

4
node.gyp

@ -250,7 +250,7 @@
# Categories to export. # Categories to export.
'-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,' '-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,'
'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,' 'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,'
'STDIO,TLSEXT', 'STDIO,TLSEXT,FP_API',
# Defines. # Defines.
'-DWIN32', '-DWIN32',
# Symbols to filter from the export list. # Symbols to filter from the export list.
@ -616,7 +616,7 @@
'test/cctest/test_inspector_socket.cc', 'test/cctest/test_inspector_socket.cc',
], ],
'conditions': [ 'conditions': [
[ 'node_shared_openssl=="false"', { [ 'node_shared_openssl=="false" and node_shared=="false"', {
'dependencies': [ 'dependencies': [
'deps/openssl/openssl.gyp:openssl' 'deps/openssl/openssl.gyp:openssl'
] ]

Loading…
Cancel
Save