summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanaya <me@nanaya.pro>2017-07-05 19:43:47 +0900
committerRefael Ackermann <refack@gmail.com>2017-07-22 10:43:41 -0400
commitfc544d4c0075c645762682326aa10e9c890f8533 (patch)
tree47309e906abf1a155b24c7d58cbd6da554dfb439
parent239ebf02440412df56b18b8d9e973ad6ab7af2f8 (diff)
downloadnode-new-fc544d4c0075c645762682326aa10e9c890f8533.tar.gz
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>
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 9a0855b49a..a481e44433 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: