diff options
| author | Stefan Budeanu <stefanbu@ca.ibm.com> | 2016-03-03 16:38:24 -0500 |
|---|---|---|
| committer | Myles Borins <mborins@us.ibm.com> | 2016-03-21 13:07:02 -0700 |
| commit | 9058fc0383845be85ebf534c9d0954104f7da8ad (patch) | |
| tree | 79a35eef2a28fa51d88454bdaee9bfe833db3f95 /deps | |
| parent | 64d5752711db79cee3744989af0a7e46d537ea5e (diff) | |
| download | nodejs-9058fc0383845be85ebf534c9d0954104f7da8ad.tar.gz nodejs-9058fc0383845be85ebf534c9d0954104f7da8ad.tar.bz2 nodejs-9058fc0383845be85ebf534c9d0954104f7da8ad.zip | |
build: correctly detect clang version
Use the "Apple LLVM" version number since the banner has changed in
newer versions of Mac OS X, resulting in the obsolete assembler path
being used to compile OpenSSL.
PR-URL: https://github.com/nodejs/node/pull/5553
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/openssl/openssl.gyp | 1 | ||||
| -rw-r--r-- | deps/openssl/openssl.gypi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 3a319d91f..db57033d5 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -8,6 +8,7 @@ 'gcc_version': 0, 'openssl_no_asm%': 0, 'llvm_version%': 0, + 'xcode_version%': 0, 'gas_version%': 0, 'openssl_fips%': 'false', }, diff --git a/deps/openssl/openssl.gypi b/deps/openssl/openssl.gypi index e2e06d833..c3824a632 100644 --- a/deps/openssl/openssl.gypi +++ b/deps/openssl/openssl.gypi @@ -1040,7 +1040,7 @@ # 'conditions': [ ['(OS=="win" and MSVS_VERSION>="2012") or ' - 'llvm_version>="3.3" or gas_version>="2.23"', { + 'llvm_version>="3.3" or xcode_version>="5.0" or gas_version>="2.23"', { 'openssl_sources_x64_win_masm': [ '<@(openssl_sources_asm_latest_x64_win_masm)', '<@(openssl_sources_common_x64_win_masm)', |