Index: openssl.gyp |
diff --git a/openssl.gyp b/openssl.gyp |
index 80733269d8bd30fb1aed695efa697d3a9e3aba8d..80f0aa715a5a596d8ba67d9d9cb79b5cc492742b 100644 |
--- a/openssl.gyp |
+++ b/openssl.gyp |
@@ -65,6 +65,17 @@ |
['target_arch == "x64"', { |
'sources': [ '<@(openssl_x86_64_sources)' ], |
'sources!': [ '<@(openssl_x86_64_source_excludes)' ], |
+ 'conditions': [['OS != "android"', { |
digit1
2013/10/10 12:27:38
nit: Ah, can I ask you to avoid the double bracket
yhirano
2013/10/11 01:42:25
Done.
|
+ # Due to a goma problem with compiling rc4-x86_64.S, |
+ # We use the C rc4 source instead of the ASM source. |
+ # This hurts performance, but it's not a problem |
+ # because no production code uses openssl on x86-64. |
+ 'sources/': [ |
+ ['exclude', 'openssl/crypto/rc4/asm/rc4-x86_64\\.S' ], |
+ ['include', 'openssl/crypto/rc4/rc4_enc\\.c' ], |
+ ['include', 'openssl/crypto/rc4/rc4_skey\\.c' ], |
digit1
2013/10/10 12:27:38
Just for clarification, why this change exactly? I
yhirano
2013/10/11 01:42:25
I found that rc4-x86_64.S defined private_RC4_set_
|
+ ], |
+ }]], |
'defines': [ '<@(openssl_x86_64_defines)' ], |
'defines!': [ 'OPENSSL_NO_ASM' ], |
'variables': { |