diff options
| author | nanaya <me@nanaya.pro> | 2017-07-05 13:43:47 +0300 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2017-07-24 17:58:25 +0300 |
| commit | c0ea5d8ce50100b7e26a316a0fce887baf64a835 (patch) | |
| tree | 3bd0d68a9a590071670e167a547a9afe7280703f /configure | |
| parent | 953736cdde4844f0a7fca9c89201e2cc2e92f077 (diff) | |
tools: always include llvm_version in config
Also used in common.gypi to check whether a flag is needed or not
based on llvm version.
PR-URL: https://github.com/nodejs/node/pull/14077
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure index 9a0855b49ad..a481e444330 100755 --- a/configure +++ b/configure @@ -640,12 +640,14 @@ def check_compiler(o): # to a version that is not completely ancient. warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC) - # Need llvm_version or gas_version when openssl asm files are compiled + if is_clang: + o['variables']['llvm_version'] = get_llvm_version(CC) + + # Need xcode_version or gas_version when openssl asm files are compiled. if options.without_ssl or options.openssl_no_asm or options.shared_openssl: return if is_clang: - o['variables']['llvm_version'] = get_llvm_version(CC) if sys.platform == 'darwin': o['variables']['xcode_version'] = get_xcode_version(CC) else: |