Skip to content

tools: skip workaround for newer llvm #14077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nanaya wants to merge 2 commits into from
Closed

tools: skip workaround for newer llvm #14077

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71dcd6e
tools: skip workaround for newer llvm
nanaya Jul 5, 2017
b2407bc
tools: always include llvm_version in config
nanaya Jul 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
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.
  • Loading branch information
@nanaya
nanaya committed Jul 5, 2017
commit b2407bc735e0f14dca380479ed3fb39d35b475fe
6 changes: 4 additions & 2 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,12 +635,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:
Expand Down