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

clang support: Adapt some version checks in qmake/qbs files

Browse Source 
Change-Id: Ic1ea0e10586c5ab33f7fad87f76d742e13a55834
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-24 12:03:18 +01:00
parent ee6b329f10
commit baaccc87ba
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ function llvmConfig(hostOS, qtcFunctions)
var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [ var llvmConfigVariants = [
// CLANG-UPGRADE-CHECK: Adapt once we require a new minimum version. // 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 // Prefer llvm-config* from LLVM_INSTALL_DIR

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

@@ -141,15 +141,14 @@ win32: BIN_EXTENSION = .exe
isEmpty(LLVM_INSTALL_DIR) { isEmpty(LLVM_INSTALL_DIR) {
unix { unix {
llvm_config = $$system(which llvm-config-8) 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
} }
isEmpty(llvm_config): llvm_config = llvm-config
} else { } else {
exists($$LLVM_INSTALL_DIR/bin/llvm-config-8$$BIN_EXTENSION) { exists($$LLVM_INSTALL_DIR/bin/llvm-config-11$$BIN_EXTENSION) {
llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-8) llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-11)
} else { } else {
llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config) llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config)
requires(exists($$llvm_config$$BIN_EXTENSION)) requires(exists($$llvm_config$$BIN_EXTENSION))
@@ -163,10 +162,10 @@ isEmpty(LLVM_VERSION) {
$$llvmWarningOrError(\ $$llvmWarningOrError(\
"Cannot determine clang version. Set LLVM_INSTALL_DIR to build the Clang Code Model",\ "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") "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. # CLANG-UPGRADE-CHECK: Adapt minimum version numbers.
$$llvmWarningOrError(\ $$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 = LLVM_VERSION =
} else { } else {
# CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved. # CLANG-UPGRADE-CHECK: Remove suppression if this warning is resolved.