From f6210b3569327a8c5db9f2918ca4cdc7b820178c Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 22 May 2020 10:48:36 +0200 Subject: [PATCH] qbs build: Clang: Adapt llvm-config variants to check for Change-Id: Ib961efe9b72acdfc383cade2053a4a1126e99132 Reviewed-by: Christian Kandeler --- qbs/modules/libclang/functions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 0c15a2a6283..d03358b3c6c 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