diff options
author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-05-16 19:56:59 +0200 |
---|---|---|
committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2017-05-25 18:39:49 +0200 |
commit | 1cde37576392f16c8652cde62804c248c77f70fb (patch) | |
tree | 8d4e40748fbbd4e9bb556a785b40bac8e11d78dd /node.gyp | |
parent | 920278bd3764e11cbd5dfdd70e76a75f2c976e16 (diff) | |
download | android-node-v8-1cde37576392f16c8652cde62804c248c77f70fb.tar.gz android-node-v8-1cde37576392f16c8652cde62804c248c77f70fb.tar.bz2 android-node-v8-1cde37576392f16c8652cde62804c248c77f70fb.zip |
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
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'node.gyp')
-rw-r--r-- | node.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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' ] |