From c364725a7e4826e90560582358edcffa99274377 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 16 May 2017 19:56:59 +0200 Subject: [PATCH] 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 Reviewed-By: Refael Ackermann --- node.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/node.gyp b/node.gyp index 5ed4d74106adff..9035c585c320e4 100644 --- a/node.gyp +++ b/node.gyp @@ -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. @@ -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' ]