diff options
| author | Yuchen Deng <loaden@gmail.com> | 2015-12-30 17:59:16 +0800 |
|---|---|---|
| committer | Yuchen Deng <loaden@gmail.com> | 2016-01-05 05:15:46 +0000 |
| commit | 856370b61bc84e7215f233e6c2f2a94d262c4498 (patch) | |
| tree | 8be7f2e8891dacffafe4b2a5781b2fa0164b5a88 /qbs | |
| parent | fc6a0c68a6fcce9eddef89f401a42e669506234e (diff) | |
| download | qt-creator-856370b61bc84e7215f233e6c2f2a94d262c4498.tar.gz | |
Clang: Fix libclang depends detect on Windows
Change-Id: Ib29a193ccfa177cbfbd0f4e8111aeb2f754dddb6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcClangInstallation/functions.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qbs/imports/QtcClangInstallation/functions.js b/qbs/imports/QtcClangInstallation/functions.js index f00b109a63..e0f1cee126 100644 --- a/qbs/imports/QtcClangInstallation/functions.js +++ b/qbs/imports/QtcClangInstallation/functions.js @@ -20,9 +20,10 @@ function llvmConfig(qbs, qtcFunctions, processOutputReader) ]; // Prefer llvm-config* from LLVM_INSTALL_DIR + var suffix = qbs.hostOS.contains("windows") ? ".exe" : ""; if (llvmInstallDirFromEnv) { for (var i = 0; i < llvmConfigVariants.length; ++i) { - var variant = llvmInstallDirFromEnv + "/bin/" + llvmConfigVariants[i]; + var variant = llvmInstallDirFromEnv + "/bin/" + llvmConfigVariants[i] + suffix; if (isSuitableLLVMConfig(variant, qtcFunctions, processOutputReader)) return variant; } @@ -34,7 +35,7 @@ function llvmConfig(qbs, qtcFunctions, processOutputReader) var pathList = pathListString.split(separator); for (var i = 0; i < llvmConfigVariants.length; ++i) { for (var j = 0; j < pathList.length; ++j) { - var variant = pathList[j] + "/" + llvmConfigVariants[i]; + var variant = pathList[j] + "/" + llvmConfigVariants[i] + suffix; if (isSuitableLLVMConfig(variant, qtcFunctions, processOutputReader)) return variant; } |