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

clang: Support user-provided llvm-config

Browse Source 
... in the qmake and qbs builds. (The look-up mechanism in the cmake
build is completely different.)

Fixes: QTCREATORBUG-20592
Change-Id: I049740795108060aeada62dd030e82390e07fe48
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-24 11:56:45 +01:00
parent f17bf14533
commit 3e2d224722
3 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,9 @@ function isSuitableLLVMConfig(llvmConfigCandidate, qtcFunctions)
function llvmConfig(hostOS, qtcFunctions)
{
var llvmConfigFromEnv = Environment.getEnv("LLVM_CONFIG");
if (llvmConfigFromEnv)
return llvmConfigFromEnv;
var llvmInstallDirFromEnv = Environment.getEnv("LLVM_INSTALL_DIR")
var llvmConfigVariants = [
// CLANG-UPGRADE-CHECK: Adapt once we require a new minimum version.