From a1c9ef314207c0ca6c1a6878543bec6c910f3667 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Tue, 31 Mar 2015 14:16:10 +0900 Subject: 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 Reviewed-By: Ben Noordhuis --- deps/openssl/openssl-cli.gypi | 1 + 1 file changed, 1 insertion(+) (limited to 'deps/openssl/openssl-cli.gypi') diff --git a/deps/openssl/openssl-cli.gypi b/deps/openssl/openssl-cli.gypi index c0d4a2a644..1209d64e46 100644 --- a/deps/openssl/openssl-cli.gypi +++ b/deps/openssl/openssl-cli.gypi @@ -5,6 +5,7 @@ 'defines': [ 'MONOLITH' ], + 'includes': ['openssl.gypi'], 'sources': ['<@(openssl_cli_sources)'], 'conditions': [ ['OS=="solaris"', { -- cgit v1.2.3