diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-03-31 14:16:10 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-04-15 00:38:57 +0900 |
| commit | a1c9ef314207c0ca6c1a6878543bec6c910f3667 (patch) | |
| tree | 679ce869e93b1c566ea14d8a5c00e78ac83b03c6 /deps/openssl/openssl.gyp | |
| parent | 53924d8ebec7ab5fbbda6e8e144328d82ab08aa3 (diff) | |
| download | android-node-v8-a1c9ef314207c0ca6c1a6878543bec6c910f3667.tar.gz android-node-v8-a1c9ef314207c0ca6c1a6878543bec6c910f3667.tar.bz2 android-node-v8-a1c9ef314207c0ca6c1a6878543bec6c910f3667.zip | |
deps, build: add support older assembler
Asm files for OpenSSL depends on the version of assembler.
We provide two sets of asm files, one is asm_latest(avx2 and addx
supported) and the other asm_obsolute(without avx1/2 and addx)
The asm_latest needs the version of gas >= 2.23, llvm >= 3.3
or ml64 >= 12 as defined in
https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/crypto/sha/asm/sha512-x86_64.pl#L112-L129
, otherwise asm_obsolute are used.
We take MSVS_VERSION in gyp as a version check of assembler on
Windows because the path to ml64.exe was set after configure in
vcbuild.bat and executing ml64.exe was failed in configure.
Fixes: https://github.com/iojs/io.js/issues/589
PR-URL: https://github.com/iojs/io.js/pull/1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 6d8b10d690..5a3dc9b6c7 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -6,13 +6,15 @@ 'variables': { 'is_clang': 0, 'gcc_version': 0, - 'openssl_no_asm%': 0 + 'openssl_no_asm%': 0, + 'llvm_version%': 0, + 'gas_version%': 0, }, - 'includes': ['openssl.gypi'], 'targets': [ { 'target_name': 'openssl', 'type': '<(library)', + 'includes': ['openssl.gypi'], 'sources': ['<@(openssl_sources)'], 'sources/': [ ['exclude', 'md2/.*$'], @@ -99,6 +101,7 @@ } ], 'target_defaults': { + 'includes': ['openssl.gypi'], 'include_dirs': ['<@(openssl_default_include_dirs)'], 'defines': ['<@(openssl_default_defines_all)'], 'conditions': [ |