diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index dd9dc1bb096..77690ab47a9 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -38,7 +38,7 @@ function llvmConfig(hostOS, qtcFunctions) var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmConfigVariants = [ // 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" + "llvm-config", "llvm-config-11", "llvm-config-10", "llvm-config-9" ]; // Prefer llvm-config* from LLVM_INSTALL_DIR diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 2ef2cb425cb..2d412c48d2b 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -141,15 +141,14 @@ win32: BIN_EXTENSION = .exe isEmpty(LLVM_INSTALL_DIR) { unix { - llvm_config = $$system(which llvm-config-8) - } - - isEmpty(llvm_config) { - llvm_config = llvm-config + llvm_config = $$system(which llvm-config-11) + isEmpty(llvm_config): llvm_config = $$system(which llvm-config-10) + isEmpty(llvm_config): llvm_config = $$system(which llvm-config-9) } + isEmpty(llvm_config): llvm_config = llvm-config } else { - exists($$LLVM_INSTALL_DIR/bin/llvm-config-8$$BIN_EXTENSION) { - llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-8) + exists($$LLVM_INSTALL_DIR/bin/llvm-config-11$$BIN_EXTENSION) { + llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-11) } else { llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config) requires(exists($$llvm_config$$BIN_EXTENSION)) @@ -163,10 +162,10 @@ isEmpty(LLVM_VERSION) { $$llvmWarningOrError(\ "Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ "LLVM_INSTALL_DIR does not contain a valid llvm-config, candidate: $$llvm_config") -} else:!versionIsAtLeast($$LLVM_VERSION, 8, 0, 0): { +} else:!versionIsAtLeast($$LLVM_VERSION, 9, 0, 0): { # CLANG-UPGRADE-CHECK: Adapt minimum version numbers. $$llvmWarningOrError(\ - "LLVM/Clang version >= 8.0.0 required, version provided: $$LLVM_VERSION") + "LLVM/Clang version >= 9.0.0 required, version provided: $$LLVM_VERSION") LLVM_VERSION = } else { # CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved.