Skip to content

Commit c0ea5d8

Browse files
nanayaFishrock123
authored andcommitted
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: #14077 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 953736c commit c0ea5d8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

configure

+4-2
Original file line numberDiff line numberDiff line change
@@ -640,12 +640,14 @@ def check_compiler(o):
640640
# to a version that is not completely ancient.
641641
warn('C compiler too old, need gcc 4.2 or clang 3.2 (CC=%s)' % CC)
642642

643-
# Need llvm_version or gas_version when openssl asm files are compiled
643+
if is_clang:
644+
o['variables']['llvm_version'] = get_llvm_version(CC)
645+
646+
# Need xcode_version or gas_version when openssl asm files are compiled.
644647
if options.without_ssl or options.openssl_no_asm or options.shared_openssl:
645648
return
646649

647650
if is_clang:
648-
o['variables']['llvm_version'] = get_llvm_version(CC)
649651
if sys.platform == 'darwin':
650652
o['variables']['xcode_version'] = get_xcode_version(CC)
651653
else:

0 commit comments

Comments
 (0)