tools: always include llvm_version in config

nanaya · addaleax · commit 19b92d7b7a8f · 2017-07-22T21:55:16.000+02:00
Also used in common.gypi to check whether a flag is needed or not based on llvm version. PR-URL: #14077 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Refael Ackermann <refack@gmail.com>
diff --git 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:

-Original file line number
+Diff line change
 # 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
 +ifis_clang:
 +o['variables']['llvm_version'] =get_llvm_version(CC)
++
 +# Need xcode_version or gas_version when openssl asm files are compiled.
 ifoptions.without_ssloroptions.openssl_no_asmoroptions.shared_openssl:
 return
 ifis_clang:
 -o['variables']['llvm_version'] =get_llvm_version(CC)
 ifsys.platform=='darwin':
 o['variables']['xcode_version'] =get_xcode_version(CC)
 else: