diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-09-22 15:21:34 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2016-11-15 08:46:46 +0000 |
| commit | fd1d10987c60e369a5347ff4c9f28f6c0087fc10 (patch) | |
| tree | c81468517014f4e30e818b3cd35bda5384f6034b | |
| parent | bf0c4e7c2bea83f54982a5b1f1529e2b40244c4c (diff) | |
Clang: Require LLVM >= 3.9.0
We already ship with a cherry-picked change from version 3.9.
Change-Id: Iad09ac8db470506c5de0321f3a2346c549b11b31
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | doc/src/editors/creator-clang-codemodel.qdoc | 2 | ||||
| -rw-r--r-- | qbs/modules/libclang/functions.js | 4 | ||||
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 4 |
4 files changed, 6 insertions, 6 deletions
@@ -25,7 +25,7 @@ Prerequisites: * cmake * On Mac OS X: latest Xcode * On Linux: g++ 4.8 or later -* LLVM 3.8.0 or later (optional, needed for the Clang Code Model) +* LLVM 3.9.0 or later (optional, needed for the Clang Code Model) The installed toolchains have to match the one Qt was compiled with. diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc index dbf90235c5..52b506ecf3 100644 --- a/doc/src/editors/creator-clang-codemodel.qdoc +++ b/doc/src/editors/creator-clang-codemodel.qdoc @@ -132,7 +132,7 @@ \list 1 - \li Acquire Clang 3.8.0 or higher in one of the following ways: + \li Acquire Clang 3.9.0 or higher in one of the following ways: \list diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 49f2512423..5ad07af8fa 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -1,7 +1,7 @@ var Environment = loadExtension("qbs.Environment") var File = loadExtension("qbs.File") var FileInfo = loadExtension("qbs.FileInfo") -var MinimumLLVMVersion = "3.8.0" +var MinimumLLVMVersion = "3.9.0" var Process = loadExtension("qbs.Process") function readOutput(executable, args) @@ -28,7 +28,7 @@ function llvmConfig(qbs, qtcFunctions) { var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ - "llvm-config", "llvm-config-3.8", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" + "llvm-config", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index a1a0fbb092..9c7c3ce85f 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -96,8 +96,8 @@ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH = isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR") -!versionIsAtLeast($$LLVM_VERSION, 3, 8, 0): { - error("LLVM/Clang version >= 3.8.0 required, version provided: $$LLVM_VERSION") +!versionIsAtLeast($$LLVM_VERSION, 3, 9, 0): { + error("LLVM/Clang version >= 3.9.0 required, version provided: $$LLVM_VERSION") } unix:LLVM_CXXFLAGS = -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS |