diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 12:07:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-08-10 13:03:27 +0000 |
| commit | 715aa04d3381a146e658d1fe63a8139b6dd923a4 (patch) | |
| tree | 3ed75a44fca42baff6a97f496ad08cc1f7dca5a5 | |
| parent | 256c239ad119ac0d1f8f4b87c196f775d2a40045 (diff) | |
Fix clazy-standalone deployment on Linux
For some reason the RHEL build of LLVM has ClazyPlugin in 'lib64'
instead of just 'lib'.
Fixes: QTCREATORBUG-24344
Change-Id: Ibfca2aabd4c25ad4d80ea0e56de5ca8692b3c7ae
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rwxr-xr-x | scripts/deployqt.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 851a642633..4aaea9b620 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -273,8 +273,9 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): # support libraries (for clazy) -> clang libexec if not os.path.exists(clanglibs_targetdir): os.makedirs(clanglibs_targetdir) - for lib_pattern in ['ClazyPlugin.so', 'libclang-cpp.so*']: - for lib in glob(os.path.join(llvm_install_dir, 'lib', lib_pattern)): + # on RHEL ClazyPlugin is in lib64 + for lib_pattern in ['lib64/ClazyPlugin.so', 'lib/ClazyPlugin.so', 'lib/libclang-cpp.so*']: + for lib in glob(os.path.join(llvm_install_dir, lib_pattern)): deployinfo.append((lib, clanglibs_targetdir)) resourcetarget = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'lib', 'clang') |