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

Clang: Require LLVM >= 3.9.0

Browse Source 
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>
This commit is contained in:
Nikolai Kosjar
2016-09-22 15:21:34 +02:00
parent bf0c4e7c2b
commit fd1d10987c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -25,7 +25,7 @@ Prerequisites:
* cmake * cmake
* On Mac OS X: latest Xcode * On Mac OS X: latest Xcode
* On Linux: g++ 4.8 or later * 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. The installed toolchains have to match the one Qt was compiled with.

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

@@ -132,7 +132,7 @@
\list 1 \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 \list

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

@@ -1,7 +1,7 @@
var Environment = loadExtension("qbs.Environment") var Environment = loadExtension("qbs.Environment")
var File = loadExtension("qbs.File") var File = loadExtension("qbs.File")
var FileInfo = loadExtension("qbs.FileInfo") var FileInfo = loadExtension("qbs.FileInfo")
var MinimumLLVMVersion = "3.8.0" var MinimumLLVMVersion = "3.9.0"
var Process = loadExtension("qbs.Process") var Process = loadExtension("qbs.Process")
function readOutput(executable, args) function readOutput(executable, args)
@@ -28,7 +28,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.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 // Prefer llvm-config* from LLVM_INSTALL_DIR

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

@@ -96,8 +96,8 @@ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH = contains(QMAKE_DEFAULT_INCDIRS, $$LLVM_INCLUDEPATH): LLVM_INCLUDEPATH =
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, 8, 0): { !versionIsAtLeast($$LLVM_VERSION, 3, 9, 0): {
error("LLVM/Clang version >= 3.8.0 required, version provided: $$LLVM_VERSION") 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 unix:LLVM_CXXFLAGS = -fno-rtti -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS