Permalink
Browse files

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
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
  • Loading branch information...
danbev authored and jasnell committed May 16, 2017
1 parent 6e4394f commit 46bd32e7e8fdf2c29d7e56bc086cfa5f482e6380
Showing with 2 additions and 2 deletions.
  1. +2 −2 node.gyp
View
@@ -277,7 +277,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.
@@ -671,7 +671,7 @@
'deps/zlib/zlib.gyp:zlib',
]
}],
[ 'node_shared_openssl=="false"', {
[ 'node_shared_openssl=="false" and node_shared=="false"', {
'dependencies': [
'deps/openssl/openssl.gyp:openssl'
]

0 comments on commit 46bd32e

Please sign in to comment.