feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix clazy-standalone deployment on Linux

Browse Source 
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>
This commit is contained in:
Eike Ziller
2020-08-10 12:07:27 +02:00
parent 256c239ad1
commit 715aa04d33
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/deployqt.py
View File

@@ -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')