diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-04-17 11:53:55 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2018-05-17 12:46:37 +0000 |
| commit | 319daa2612dcdd205e271cf2b4b5bf4532fad163 (patch) | |
| tree | b67dcbf4424c1cc00475b0ead75b218fb66e2942 /src/shared | |
| parent | c49854f423af755191a375dc030157f929648ced (diff) | |
Clang: Require LLVM/Clang >= 6.0.0
Adapt versions and tests, remove code assuming clang < 6.0.
Switch also to our custom repositories instead of dealing with patch
files.
LLVM/Clang 6 was released on 09 Mar 2018.
Task-number: QTCREATORBUG-18535
Task-number: QTCREATORBUG-18552
Change-Id: I0ec2c2f56265e161ae7cbb5b03e7b8a182ba6cc6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 34132a6b538..b9cc4c9704b 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -101,10 +101,10 @@ isEmpty(LLVM_VERSION) { $$llvmWarningOrError(\ "Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ "LLVM_INSTALL_DIR does not contain a valid llvm-config, candidate: $$llvm_config") -} else:!versionIsAtLeast($$LLVM_VERSION, 5, 0, 0): { +} else:!versionIsAtLeast($$LLVM_VERSION, 6, 0, 0): { # CLANG-UPGRADE-CHECK: Adapt minimum version numbers. $$llvmWarningOrError(\ - "LLVM/Clang version >= 5.0.0 required, version provided: $$LLVM_VERSION") + "LLVM/Clang version >= 6.0.0 required, version provided: $$LLVM_VERSION") LLVM_VERSION = } else { LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines)) @@ -141,11 +141,11 @@ isEmpty(LLVM_VERSION) { QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING) isEmpty(QTC_NO_CLANG_LIBTOOLING) { QTC_FORCE_CLANG_LIBTOOLING = $$(QTC_FORCE_CLANG_LIBTOOLING) - versionIsEqual($$LLVM_VERSION, 5, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) { + versionIsEqual($$LLVM_VERSION, 6, 0)|!isEmpty(QTC_FORCE_CLANG_LIBTOOLING) { !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR} LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS } else { - warning("Clang LibTooling is disabled because only version 5.0 is supported.") + warning("Clang LibTooling is disabled because only version 6.0 is supported.") } } else { warning("Clang LibTooling is disabled.") |