summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorFedor Indutny <fedor.indutny@gmail.com>2013-12-14 15:28:07 +0400
committerFedor Indutny <fedor.indutny@gmail.com>2014-01-05 16:42:33 +0400
commit92b6417098371259730c00360979101ce38cbe12 (patch)
treec1417151c0c4d5f01e1debcc4e5d2e210e39c750 /deps
parenta40b46367406deb0e3c67dff8c5d609d1334519b (diff)
downloadnodejs-92b6417098371259730c00360979101ce38cbe12.tar.gz
nodejs-92b6417098371259730c00360979101ce38cbe12.tar.bz2
nodejs-92b6417098371259730c00360979101ce38cbe12.zip
crypto: introduce .setEngine(engine, [flags])
Diffstat (limited to 'deps')
-rw-r--r--deps/openssl/openssl.gyp19
1 files changed, 17 insertions, 2 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 1775b774c..b3ae00410 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -928,7 +928,15 @@
'-lgdi32.lib',
'-luser32.lib',
]
- }
+ },
+ 'defines': [
+ 'DSO_WIN32',
+ ],
+ }, {
+ 'defines': [
+ 'DSO_DLFCN',
+ 'HAVE_DLFCN_H'
+ ],
}],
['target_arch=="arm"', {
'sources': ['openssl/crypto/armcap.c'],
@@ -1028,7 +1036,14 @@
'-luser32.lib',
],
},
- }]
+ }],
+ [ 'OS in "linux android"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
]
}
],