diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2025-04-08 17:05:59 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2025-04-25 11:51:49 +0000 |
| commit | d5450782b361d4b64cf70580423c3d679d511433 (patch) | |
| tree | 4d049b8643ee893b9fc270a89d0f94862e1d5c5e /scripts/deploy.py | |
| parent | 6ac6ba1af17451f1ef8512c25ec405f455a89ada (diff) | |
Coin/GitHub Actions: Update LLVM to version 20.1.3
Starting with LLVM 20.1.3 clazy-standalone doesn't come with the
ClazyPlugin.so|dylib dependency, thus there is no need to deploy it.
Task-number: QTCREATORBUG-32582
Change-Id: Id452e53c60231633d8647cf5d4d40e55c0503e43
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'scripts/deploy.py')
| -rwxr-xr-x | scripts/deploy.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/deploy.py b/scripts/deploy.py index cc751f57006..f163b35caa3 100755 --- a/scripts/deploy.py +++ b/scripts/deploy.py @@ -289,7 +289,8 @@ def deploy_clang(qtc_binary_path, llvm_install_dir, chrpath_bin): os.makedirs(clanglibs_targetdir) 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)) + if os.path.exists(lib): + deployinfo.append((lib, clanglibs_targetdir)) else: clang_targetdir = os.path.join(qtc_binary_path, 'Contents', 'Resources', 'libexec', 'clang') clanglibs_targetdir = os.path.join(clang_targetdir, 'lib') @@ -300,7 +301,8 @@ def deploy_clang(qtc_binary_path, llvm_install_dir, chrpath_bin): if not os.path.exists(clanglibs_targetdir): os.makedirs(clanglibs_targetdir) clazy_plugin = os.path.join(llvm_install_dir, 'lib', 'ClazyPlugin.dylib') - deployinfo.append((clazy_plugin, clanglibs_targetdir)) + if os.path.exists(clazy_plugin): + deployinfo.append((clazy_plugin, clanglibs_targetdir)) # collect binaries if not os.path.exists(clangbinary_targetdir): @@ -327,7 +329,7 @@ def deploy_clang(qtc_binary_path, llvm_install_dir, chrpath_bin): filename = os.path.basename(source) targetfilepath = target if not os.path.isdir(target) else os.path.join(target, filename) if filename == 'clazy-standalone': - subprocess.check_call([chrpath_bin, '-r', '$ORIGIN/../lib', targetfilepath]) + subprocess.call([chrpath_bin, '-r', '$ORIGIN/../lib', targetfilepath]) elif not os.path.islink(target): targetfilepath = target if not os.path.isdir(target) else os.path.join(target, os.path.basename(source)) subprocess.check_call([chrpath_bin, '-d', targetfilepath]) |