Skip to content

Commit 890e210

Browse files
danbevMylesBorins
authored andcommitted
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: #12952 PR-URL: #13078 Backport-PR-URL: #12948 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 3bb117e commit 890e210

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

node.gyp

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
# Categories to export.
251251
'-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,'
252252
'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,SOCK,'
253-
'STDIO,TLSEXT',
253+
'STDIO,TLSEXT,FP_API',
254254
# Defines.
255255
'-DWIN32',
256256
# Symbols to filter from the export list.
@@ -616,7 +616,7 @@
616616
'test/cctest/test_inspector_socket.cc',
617617
],
618618
'conditions': [
619-
[ 'node_shared_openssl=="false"', {
619+
[ 'node_shared_openssl=="false" and node_shared=="false"', {
620620
'dependencies': [
621621
'deps/openssl/openssl.gyp:openssl'
622622
]

0 commit comments

Comments
 (0)