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

Clang: Default to llvm-config-7

Browse Source 
Change-Id: Id29095f378268b55430e715ec7d37f5a52159df5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Orgad Shaneh
2018-11-14 23:57:56 +02:00
committed by Orgad Shaneh
parent e38c8724e4
commit 3b30bfa35f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ function llvmConfig(hostOS, qtcFunctions)
{ {
var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR") var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [ var llvmConfigVariants = [
"llvm-config", "llvm-config-6.0", "llvm-config-7.0", "llvm-config-8.0", "llvm-config-9.0" "llvm-config", "llvm-config-7", "llvm-config-8", "llvm-config-9"
]; ];
// Prefer llvm-config* from LLVM_INSTALL_DIR // Prefer llvm-config* from LLVM_INSTALL_DIR

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

@@ -121,15 +121,15 @@ win32: BIN_EXTENSION = .exe
isEmpty(LLVM_INSTALL_DIR) { isEmpty(LLVM_INSTALL_DIR) {
unix { unix {
llvm_config = $$system(which llvm-config-6.0) llvm_config = $$system(which llvm-config-7)
} }
isEmpty(llvm_config) { isEmpty(llvm_config) {
llvm_config = llvm-config llvm_config = llvm-config
} }
} else { } else {
exists($$LLVM_INSTALL_DIR/bin/llvm-config-6.0$$BIN_EXTENSION) { exists($$LLVM_INSTALL_DIR/bin/llvm-config-7$$BIN_EXTENSION) {
llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-6.0) llvm_config = $$system_quote($$LLVM_INSTALL_DIR/bin/llvm-config-7)
} 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))