feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Require at least LLVM 3.8.0

Browse Source 
Change-Id: I2de3eef7bc06cba6298d64a9a042a01decc05384
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Nikolai Kosjar
2016-07-05 11:52:49 +02:00
parent bdff47afd5
commit 9650adad14
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -23,6 +23,7 @@ Prerequisites:
* jom * jom
* On Mac OS X: latest Xcode * On Mac OS X: latest Xcode
* On Linux: g++ 4.7 or later * On Linux: g++ 4.7 or later
* LLVM 3.8.0 or later for the Clang Code Model
The installed toolchains have to match the one Qt was compiled with. The installed toolchains have to match the one Qt was compiled with.
@@ -116,7 +117,7 @@ For detailed information on the supported compilers, see
command...` error. If a `sh.exe` is found, the compile process will fail. command...` error. If a `sh.exe` is found, the compile process will fail.
You have to remove it from the path. You have to remove it from the path.
10. To enable the Clang-based code model: Install Clang (>= version 3.6.2) 10. To enable the Clang-based code model: Install Clang (>= version 3.8.0)
and set the environment variable LLVM_INSTALL_DIR to point to the and set the environment variable LLVM_INSTALL_DIR to point to the
installation location. installation location.

2
doc/src/editors/creator-clang-codemodel.qdoc
View File

@@ -103,7 +103,7 @@
\list 1 \list 1
\li Acquire Clang 3.6.2 or higher in one of the following ways: \li Acquire Clang 3.8.0 or higher in one of the following ways:
\list \list

5
qbs/modules/libclang/functions.js
View File

@@ -1,6 +1,6 @@
var Environment = loadExtension("qbs.Environment") var Environment = loadExtension("qbs.Environment")
var File = loadExtension("qbs.File") var File = loadExtension("qbs.File")
var MinimumLLVMVersion = "3.6.2" var MinimumLLVMVersion = "3.8.0"
var Process = loadExtension("qbs.Process") var Process = loadExtension("qbs.Process")
function readOutput(executable, args) function readOutput(executable, args)
@@ -27,8 +27,7 @@ function llvmConfig(qbs, qtcFunctions)
{ {
var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [ var llvmConfigVariants = [
"llvm-config", "llvm-config-3.2", "llvm-config-3.3", "llvm-config-3.4", "llvm-config", "llvm-config-3.8", "llvm-config-3.9", "llvm-config-4.0", "llvm-config-4.1"
"llvm-config-3.5", "llvm-config-3.6", "llvm-config-4.0", "llvm-config-4.1"
]; ];
// Prefer llvm-config* from LLVM_INSTALL_DIR // Prefer llvm-config* from LLVM_INSTALL_DIR

4
src/shared/clang/clang_installation.pri
View File

@@ -106,6 +106,6 @@ unix {
} }
isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR") isEmpty(LLVM_VERSION): error("Cannot determine clang version at $$LLVM_INSTALL_DIR")
!versionIsAtLeast($$LLVM_VERSION, 3, 6, 2): { !versionIsAtLeast($$LLVM_VERSION, 3, 8, 0): {
error("LLVM/Clang version >= 3.6.2 required, version provided: $$LLVM_VERSION") error("LLVM/Clang version >= 3.8.0 required, version provided: $$LLVM_VERSION")
} }