diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-06-11 15:10:32 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-06-11 13:54:27 +0000 |
| commit | 37014678e52ce3c780e0f2e82d2d9daa685bc636 (patch) | |
| tree | ff02acedd4e80b818d276ca2722dafdc19863c94 | |
| parent | ae7aaa158c9ef52da1b71e35610bfd5041fcda86 (diff) | |
Qtcreator_libclang: Fix clazy build with MSVCv5.12.9-packaging
As it turns out Clazy with MSVC requires a library called clang.lib
which is an import library from clang.exe, and not the import library
of libclang.dll.
Change-Id: I52f5df4183f2605a833ab7f2f63c0f867a4d4c67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | packaging-tools/build_clang.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packaging-tools/build_clang.py b/packaging-tools/build_clang.py index fbeafee27..c9157a807 100644 --- a/packaging-tools/build_clang.py +++ b/packaging-tools/build_clang.py @@ -331,8 +331,11 @@ def build_clazy(toolchain, src_path, build_path, install_path, bitness=64, envir '-G', cmake_generator(toolchain), '-DCMAKE_INSTALL_PREFIX=' + install_path, '-DCMAKE_BUILD_TYPE=Release', - '-DCMAKE_PREFIX_PATH=' + install_path, - '-DCLANG_LIBRARY_IMPORT=libclang'] + '-DCMAKE_PREFIX_PATH=' + install_path] + + if is_msvc_toolchain(toolchain): + cmake_cmd.append('-DCLANG_LIBRARY_IMPORT=' + build_path + '/../build/lib/clang.lib') + cmake_cmd.extend(bitness_flags(bitness)) cmake_cmd.append(src_path) bldinstallercommon.do_execute_sub_process(cmake_cmd, build_path, extra_env=environment) |