diff options
| author | Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> | 2023-07-13 14:21:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-07-13 18:56:08 +0000 |
| commit | f0910516a8e832cc1f68b3b85b8ad60e9d35286c (patch) | |
| tree | 84e5669aa2300e8e59d24e09b83d8fdae6a5f810 | |
| parent | f2ac9b0bbd41c0b3fb3fff28f84ebab985cda574 (diff) | |
Cleanup build scripts
- remove unused variable for update_rpaths()
Change-Id: I0bee785c6d90bf889a9afce511df3f7c201142e2
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 7db4ffff0e4a794207c8a6c29e5e9c6bf9757681)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/main.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 58bd40787..6704f473e 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -1091,7 +1091,7 @@ class PysideBuild(_build, CommandMixin, BuildInfoCollectorMixin): recursively)""" return self._find_shared_libraries(initial_path, recursive=True) - def update_rpath(self, package_path, executables, libexec=False, message=None): + def update_rpath(self, executables, libexec=False, message=None): ROOT = '@loader_path' if sys.platform == 'darwin' else '$ORIGIN' QT_PATH = '/../lib' if libexec else '/Qt/lib' diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 753daf898..8665fb2dc 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -240,7 +240,7 @@ def prepare_packages_posix(pyside_build, _vars, cross_build=False): # Update rpath to $ORIGIN if sys.platform.startswith('linux') or sys.platform.startswith('darwin'): rpath_path = destination_dir - pyside_build.update_rpath(rpath_path, executables) - pyside_build.update_rpath(rpath_path, pyside_build.package_libraries(rpath_path)) + pyside_build.update_rpath(executables) + pyside_build.update_rpath(pyside_build.package_libraries(rpath_path)) if libexec_executables: - pyside_build.update_rpath(rpath_path, libexec_executables, libexec=True) + pyside_build.update_rpath(libexec_executables, libexec=True) |