summaryrefslogtreecommitdiff
path: root/deps/openssl/openssl.gyp
diff options
context:
space:
mode:
authorNathan Rajlich <nathan@tootallnate.net>2012-08-23 11:28:17 -0700
committerNathan Rajlich <nathan@tootallnate.net>2012-08-23 16:45:55 -0700
commitf8fd9aca8bd01fa7226e1abe75a5bcf903f287ab (patch)
tree12e64a57d833931a482f2b6b3f53f8ea2085846a /deps/openssl/openssl.gyp
parent985fdf2cb38c3537fb31d57dc402793a19a5e43b (diff)
downloadnode-f8fd9aca8bd01fa7226e1abe75a5bcf903f287ab.tar.gz
build: use the openssl android configuration for "arm" builds
Diffstat (limited to 'deps/openssl/openssl.gyp')
-rw-r--r--deps/openssl/openssl.gyp6
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 7a031ec24..cbc00079a 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -650,9 +650,13 @@
}],
['target_arch=="ia32"', {
'variables': {'openssl_config_path': 'config/piii'},
- }, {
+ }],
+ ['target_arch=="x64"', {
'variables': {'openssl_config_path': 'config/k8'},
}],
+ ['target_arch=="arm"', {
+ 'variables': {'openssl_config_path': 'config/android'},
+ }],
],
'include_dirs': [
'.',