summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl.gyp
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2011-12-19 23:24:29 +0100
committerBen Noordhuis <info@bnoordhuis.nl>2011-12-19 23:24:29 +0100
commit213b8af2f605efc15b25ac33aaf55920962f7182 (patch)
tree6c9f97f6fffa3853d58bfaccb33b2465b93443e3 /deps/openssl/openssl.gyp
parent15d0fa6dc125d986cdcd0ef02950c4a79e9fff77 (diff)
downloadandroid-node-v8-213b8af2f605efc15b25ac33aaf55920962f7182.tar.gz
android-node-v8-213b8af2f605efc15b25ac33aaf55920962f7182.tar.bz2
android-node-v8-213b8af2f605efc15b25ac33aaf55920962f7182.zip
gyp: include opensslconf.h on x64
Good news, it means we don't have to compile with OPENSSL_NO_ASM=1 after all.
Diffstat (limited to 'deps/openssl/openssl.gyp')
-rw-r--r--deps/openssl/openssl.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 45933094de..1715c0fc71 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -8,7 +8,6 @@
'target_name': 'openssl',
'type': '<(library)',
'defines': [
- 'OPENSSL_NO_ASM=1', # revisit, this slows down most algorithms
'L_ENDIAN',
'OPENSSLDIR="ssl"',
'ENGINESDIR="ssl/lib/engines"',
@@ -39,7 +38,7 @@
'TERMIO',
],
}],
- ['target_arch=="ia32"', {
+ ['target_arch=="ia32" or target_arch=="x64"', {
'include_dirs': [
'config/piii',
],