diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2017-09-19 12:57:08 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2017-10-11 11:29:34 +0000 |
| commit | 74a742cf33abb07a02fb69580df4425eb2d02ca3 (patch) | |
| tree | 94f2eefb489b5fc70c89cd396d10625a08ef9e9c /mkspecs | |
| parent | 9dbdf0d1f6b9ebe732cdb24d1d2611d41bada1f0 (diff) | |
| download | qttools-74a742cf33abb07a02fb69580df4425eb2d02ca3.tar.gz | |
qdoc: Allow automatic selection of libclang based on target architecture
Setting 'LLVM_INSTALL_DIR=/path/to/clang-_ARCH_' now searches for LLVM
in /path/to/clang-64 or /path/to/clang-32, depending on the target
architecture.
Change-Id: I555b6f345731448f66a30947d1e7d4a965caae1c
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_find_clang.prf | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf index 03a57f6a3..1fef3bf0b 100644 --- a/mkspecs/features/qt_find_clang.prf +++ b/mkspecs/features/qt_find_clang.prf @@ -42,7 +42,10 @@ defineReplace(findLLVMVersionFromLibDir) { for(_, $$list(_)) { # just a way to break easily isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR) LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR) - clangInstallDir = $$LLVM_INSTALL_DIR + contains(QT_ARCH, x86_64): \ + clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 64) + else: \ + clangInstallDir = $$replace(LLVM_INSTALL_DIR, _ARCH_, 32) isEmpty(LLVM_INSTALL_DIR) { win32 { log("Set the LLVM_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)") @@ -65,7 +68,7 @@ for(_, $$list(_)) { # just a way to break easily } isEmpty(CLANG_VERSION) { !isEmpty(LLVM_INSTALL_DIR): \ - error("Cannot determine clang version at $${LLVM_INSTALL_DIR}.") + error("Cannot determine clang version at $${clangInstallDir}.") log("Set the LLVM_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)") break() } |