diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-06 14:41:24 +0200 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-08-10 09:03:00 +0000 |
| commit | c1a0d897327af3e63ab00e7b0f5a9101991ed713 (patch) | |
| tree | 4a37705e9d882cefeb12fb68a960dba2c768a13c /scripts | |
| parent | 92b85eb24f1007590cb06e0db3cb1b1255ad0523 (diff) | |
Deploy: Ship prebuilt clangd binary together with clang
Change-Id: I67f4f8ba66cc5ced0871dd6471860210c1dd558e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index f7891f4e79..4efe99761c 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -222,16 +222,20 @@ def deploy_libclang(install_dir, llvm_install_dir, chrpath_bin): clangbindirtarget)) deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clang-cl.exe'), clangbindirtarget)) + deployinfo.append((os.path.join(llvm_install_dir, 'bin', 'clangd.exe'), + clangbindirtarget)) resourcetarget = os.path.join(clanglibdirtarget, 'clang') else: libsources = glob(os.path.join(llvm_install_dir, 'lib', 'libclang.so*')) for libsource in libsources: deployinfo.append((libsource, os.path.join(install_dir, 'lib', 'qtcreator'))) clangbinary = os.path.join(llvm_install_dir, 'bin', 'clang') + clangdbinary = os.path.join(llvm_install_dir, 'bin', 'clangd') clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin') if not os.path.exists(clangbinary_targetdir): os.makedirs(clangbinary_targetdir) deployinfo.append((clangbinary, clangbinary_targetdir)) + deployinfo.append((clangdbinary, clangbinary_targetdir)) # copy link target if clang is actually a symlink if os.path.islink(clangbinary): linktarget = os.readlink(clangbinary) |