aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2020-05-22 10:48:36 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2020-05-22 13:21:44 +0000
commitf6210b3569327a8c5db9f2918ca4cdc7b820178c (patch)
treea36ecfbaae2394778c2bdb4d6baee3b10f353f6e /qbs
parent20c387f63630b49d9383af9fadbf16c5aaadeaa6 (diff)
qbs build: Clang: Adapt llvm-config variants to check for
Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/modules/libclang/functions.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js
index 0c15a2a628..d03358b3c6 100644
--- a/qbs/modules/libclang/functions.js
+++ b/qbs/modules/libclang/functions.js
@@ -37,7 +37,8 @@ function llvmConfig(hostOS, qtcFunctions)
{
var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [
- "llvm-config", "llvm-config-7", "llvm-config-8", "llvm-config-9"
+ // CLANG-UPGRADE-CHECK: Adapt once we require a new minimum version.
+ "llvm-config", "llvm-config-8", "llvm-config-9", "llvm-config-10", "llvm-config-11", "llvm-config-12"
];
// Prefer llvm-config* from LLVM_INSTALL_DIR