diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2022-06-14 18:21:17 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2022-06-17 14:05:03 +0000 |
| commit | cdedc711825162c44e451deddbcecd47989acf14 (patch) | |
| tree | 27b016213829ff3c93cf30c58fdece9c6151d7c7 /scripts | |
| parent | 153ff77a6b4f9b1a36d4c56d6349cde76664e754 (diff) | |
| download | qt-creator-cdedc711825162c44e451deddbcecd47989acf14.tar.gz | |
scripts: Do not deploly clang and clang-cl executables
They were used in debugging of the libclang code model, and having
only the compiler is not very useful.
Users can install complete LLVM toolchains from llvm.org
Change-Id: If19a0b75c8505ba7589b377292bd96f855e91c00
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/deployqt.py | 4 | ||||
| -rwxr-xr-x | scripts/deployqtHelper_mac.sh | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/scripts/deployqt.py b/scripts/deployqt.py index 33d216751f..bfbc9ebf30 100755 --- a/scripts/deployqt.py +++ b/scripts/deployqt.py @@ -238,7 +238,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin): clanglibdirtarget = os.path.join(install_dir, 'bin', 'clang', 'lib') if not os.path.exists(clanglibdirtarget): os.makedirs(clanglibdirtarget) - for binary in ['clang', 'clang-cl', 'clangd', 'clang-tidy', 'clazy-standalone']: + for binary in ['clangd', 'clang-tidy', 'clazy-standalone']: binary_filepath = os.path.join(llvm_install_dir, 'bin', binary + '.exe') if os.path.exists(binary_filepath): deployinfo.append((binary_filepath, clangbindirtarget)) @@ -248,7 +248,7 @@ def deploy_clang(install_dir, llvm_install_dir, chrpath_bin): clangbinary_targetdir = os.path.join(install_dir, 'libexec', 'qtcreator', 'clang', 'bin') if not os.path.exists(clangbinary_targetdir): os.makedirs(clangbinary_targetdir) - for binary in ['clang', 'clangd', 'clang-tidy', 'clazy-standalone']: + for binary in ['clangd', 'clang-tidy', 'clazy-standalone']: binary_filepath = os.path.join(llvm_install_dir, 'bin', binary) if os.path.exists(binary_filepath): deployinfo.append((binary_filepath, clangbinary_targetdir)) diff --git a/scripts/deployqtHelper_mac.sh b/scripts/deployqtHelper_mac.sh index 8e6880f7d9..e3a0871d4d 100755 --- a/scripts/deployqtHelper_mac.sh +++ b/scripts/deployqtHelper_mac.sh @@ -120,12 +120,6 @@ if [ $LLVM_INSTALL_DIR ]; then 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 - clangsource="$LLVM_INSTALL_DIR"/bin/clang - clanglinktarget="$(readlink "$clangsource")" - cp -Rf "$clangsource" "$libexec_path/clang/bin/" || exit 1 - if [ $clanglinktarget ]; then - cp -Rf "$(dirname "$clangsource")/$clanglinktarget" "$libexec_path/clang/bin/$clanglinktarget" || exit 1 - fi clangdsource="$LLVM_INSTALL_DIR"/bin/clangd cp -Rf "$clangdsource" "$libexec_path/clang/bin/" || exit 1 clangtidysource="$LLVM_INSTALL_DIR"/bin/clang-tidy |