diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2022-06-21 13:34:04 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-06-22 08:29:14 +0000 |
| commit | 61f04d260c6035bf06d3b11b3e2326c78b7f613c (patch) | |
| tree | 3bd75e8bdac40bebfa83769e716d6da2a7501fae /scripts | |
| parent | f4ea9e09ec3fc2883e13b55ea3cf4ce034f8f487 (diff) | |
scripts: remove deployment of libclang-cpp
All the clang binaries that we ship (clangd, clang-tidy,
clazy-standalone) are compiled statically and libclang-cpp
is not needed anymore.
Change-Id: I486fc0d1a55a18916c0abf56ec6a966321ef2b46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 2 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index bfbc9ebf30a..f02f41652fa 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -262,7 +262,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin): if not os.path.exists(clanglibs_targetdir): os.makedirs(clanglibs_targetdir) # on RHEL ClazyPlugin is in lib64 - for lib_pattern in ['lib64/ClazyPlugin.so', 'lib/ClazyPlugin.so', 'lib/libclang-cpp.so*']: + for lib_pattern in ['lib64/ClazyPlugin.so', 'lib/ClazyPlugin.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') diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index e3a0871d4d6..487cdfda656 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -111,14 +111,13 @@ fi # copy clang if needed if [ $LLVM_INSTALL_DIR ]; then - if [ "$LLVM_INSTALL_DIR"/lib/libclang-cpp.dylib -nt "$libexec_path"/clang/lib/libclang-cpp.dylib ]; then + if [ "$LLVM_INSTALL_DIR"/bin/clangd -nt "$libexec_path"/clang/bin/clangd ]; then echo "- Copying clang" mkdir -p "$app_path/Contents/Frameworks" || exit 1 # use recursive copy to make it copy symlinks as symlinks mkdir -p "$libexec_path/clang/bin" mkdir -p "$libexec_path/clang/lib" cp -Rf "$LLVM_INSTALL_DIR"/lib/clang "$libexec_path/clang/lib/" || exit 1 - cp -Rf "$LLVM_INSTALL_DIR"/lib/libclang-cpp.dylib "$libexec_path/clang/lib/" || exit 1 cp -Rf "$LLVM_INSTALL_DIR"/lib/ClazyPlugin.dylib "$libexec_path/clang/lib/" || exit 1 clangdsource="$LLVM_INSTALL_DIR"/bin/clangd cp -Rf "$clangdsource" "$libexec_path/clang/bin/" || exit 1 |