diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-05 10:39:41 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-05 15:32:23 +0000 |
| commit | bab97bf9b6e2060af8d56918e709a09fb0aeebef (patch) | |
| tree | 7bd98b7efae80e2ee730c75819642aa0ffc18e02 /qbs | |
| parent | 20dc69c45dddf1672b0a2beca27d8dbc3ba2ad00 (diff) | |
qbs build: Disable clang tooling plugins for llvm >= 10
They won't build with the new version.
Change-Id: I77c94817290418b0a97222465f0f8a8660053fae
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 3 | ||||
| -rw-r--r-- | qbs/modules/libclang/libclang.qbs | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index d1bd2dd2ea..0c15a2a628 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -3,6 +3,7 @@ var File = require("qbs.File") var FileInfo = require("qbs.FileInfo") var MinimumLLVMVersion = "8.0.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers. var Process = require("qbs.Process") +var Utilities = require("qbs.Utilities") function readOutput(executable, args) { @@ -108,6 +109,8 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) return []; var clangVersion = version(llvmConfig) + if (Utilities.versionCompare(clangVersion, "10") >= 0) + return []; var libs = [] if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { if (qtcFunctions.versionIsAtLeast(clangVersion, "8.0.0")) { diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 9c2cfae23d..bb2878f198 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -64,7 +64,8 @@ Module { return incl != llvmIncludeDir; }) property stringList llvmToolingCxxFlags: clangProbe.llvmToolingCxxFlags - property bool toolingEnabled: !Environment.getEnv("QTC_DISABLE_CLANG_REFACTORING") + property bool toolingEnabled: Utilities.versionCompare(llvmVersion, "10") < 0 + && !Environment.getEnv("QTC_DISABLE_CLANG_REFACTORING") validate: { if (!clangProbe.found) { |