Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c0ea5d8

Browse filesBrowse 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 <info@bnoordhuis.nl> Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent 953736c commit c0ea5d8
Copy full SHA for c0ea5d8

File tree

Expand file treeCollapse file tree

1 file changed

+4
-2
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+4
-2
lines changed
Open diff view settings
Collapse file

‎configure‎

Copy file name to clipboardExpand all lines: configure
+4-2Lines changed: 4 additions & 2 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.