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

Clang: Always prefer llvm-config* from LLVM_INSTALL_DIR

Browse Source 
Change-Id: I981c39fcbb9d17115c62cb88499c2354cffc9fa5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2014-01-03 13:37:16 +01:00
parent a20c874f73
commit 386c37cdec
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/clangcodemodel/clang_installation.pri
View File

@@ -9,6 +9,17 @@ defineReplace(findLLVMConfig) {
llvm-config llvm-config-3.2 llvm-config-3.3 llvm-config-3.4 \ llvm-config llvm-config-3.2 llvm-config-3.3 llvm-config-3.4 \
llvm-config-3.5 llvm-config-3.6 llvm-config-4.0 llvm-config-4.1 llvm-config-3.5 llvm-config-3.6 llvm-config-4.0 llvm-config-4.1
# Prefer llvm-config* from LLVM_INSTALL_DIR
!isEmpty(LLVM_INSTALL_DIR) {
for (variant, LLVM_CONFIG_VARIANTS) {
variant=$$LLVM_INSTALL_DIR/bin/$$variant
exists($$variant) {
return($$variant)
}
}
}
# Find llvm-config* in PATH
ENV_PATH = $$(PATH) ENV_PATH = $$(PATH)
win32 { win32 {
ENV_PATH = $$split($$ENV_PATH, ;) ENV_PATH = $$split($$ENV_PATH, ;)
@@ -16,12 +27,6 @@ defineReplace(findLLVMConfig) {
ENV_PATH = $$split($$ENV_PATH, :) ENV_PATH = $$split($$ENV_PATH, :)
} }
for (variant, LLVM_CONFIG_VARIANTS) { for (variant, LLVM_CONFIG_VARIANTS) {
!isEmpty(LLVM_INSTALL_DIR) {
variant=$$LLVM_INSTALL_DIR/bin/$$variant
exists($$variant) {
return($$variant)
}
} else {
for (path, ENV_PATH) { for (path, ENV_PATH) {
subvariant = $$path/$$variant subvariant = $$path/$$variant
exists($$subvariant) { exists($$subvariant) {
@@ -29,7 +34,8 @@ defineReplace(findLLVMConfig) {
} }
} }
} }
}
# Fallback
return(llvm-config) return(llvm-config)
} }