Skip to content

Commit

Permalink
build: fix openssl link error on windows
Browse files Browse the repository at this point in the history
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: nodejs#12952
PR-URL: nodejs#13078
Backport-PR-URL: nodejs#12948
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information
danbev authored and gibfahn committed Jun 17, 2017
1 parent 713e018 commit adb9bfb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
# Categories to export.
'-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,'
'STDIO,TLSEXT',
'STDIO,TLSEXT,FP_API',
# Defines.
'-DWIN32',
# Symbols to filter from the export list.
Expand Down Expand Up @@ -616,7 +616,7 @@
'test/cctest/test_inspector_socket.cc',
],
'conditions': [
[ 'node_shared_openssl=="false"', {
[ 'node_shared_openssl=="false" and node_shared=="false"', {
'dependencies': [
'deps/openssl/openssl.gyp:openssl'
]
Expand Down

0 comments on commit adb9bfb

Please sign in to comment.