diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-04-30 15:26:36 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-05-04 09:58:37 +0000 |
| commit | 52ac74b61ce7000d693b846e0de1b4cf833ca50a (patch) | |
| tree | 8d1b6d85839d11b2207e244b024a05b4a77a25c7 /qbs | |
| parent | 80ae992c91985389f6d870ac0201c16d895bc5cc (diff) | |
ClangTools: Remove clang executable settings
We use custom clang executable and it does not make
sense anymore to give a choice of changing it.
Change-Id: Icf86042ac3fcd08c320ef2bbdaabef1102b023b5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 5 | ||||
| -rw-r--r-- | qbs/modules/libclang/libclang.qbs | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 7d5e4149fc..192473391a 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -74,6 +74,11 @@ function libDir(llvmConfig) return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--libdir"])); } +function binDir(llvmConfig) +{ + return FileInfo.fromNativeSeparators(readOutput(llvmConfig, ["--bindir"])); +} + function version(llvmConfig) { return readOutput(llvmConfig, ["--version"]).replace(/(\d+\.\d+\.\d+).*/, "$1") diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index 3b68faa0bb..eeb233f12a 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -16,6 +16,7 @@ Module { property string llvmVersion property string llvmIncludeDir property string llvmLibDir + property string llvmBinDir property stringList llvmLibs property stringList llvmToolingLibs property stringList llvmToolingDefines @@ -28,6 +29,7 @@ Module { llvmVersion = ClangFunctions.version(llvmConfig); llvmIncludeDir = ClangFunctions.includeDir(llvmConfig); llvmLibDir = ClangFunctions.libDir(llvmConfig); + llvmBinDir = ClangFunctions.binDir(llvmConfig); llvmLibs = ClangFunctions.libraries(targetOS); llvmToolingLibs = ClangFunctions.toolingLibs(llvmConfig, targetOS); llvmBuildMode = ClangFunctions.buildMode(llvmConfig); @@ -43,6 +45,7 @@ Module { property string llvmVersion: clangProbe.llvmVersion property string llvmIncludeDir: clangProbe.llvmIncludeDir property string llvmLibDir: clangProbe.llvmLibDir + property string llvmBinDir: clangProbe.llvmBinDir property stringList llvmLibs: clangProbe.llvmLibs property stringList llvmToolingLibs: clangProbe.llvmToolingLibs property string llvmBuildMode: clangProbe.llvmBuildMode |