diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-29 08:08:36 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-29 08:08:36 +0100 |
commit | 1484dc600a35ea5bd1517ed945902151ff293c14 (patch) | |
tree | 11f9de6473cea409ef5d977def8508f72d4d7630 /setup.py | |
parent | 1c9e0d95263480a5ae5d645cabb41f835d1dbb70 (diff) | |
parent | 0022a9ecb7690a3bd9a7d4ce0880d1cecc937462 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ibef497a2439a05114eb2123e5f39c00aec8dc460
Diffstat (limited to 'setup.py')
-rw-r--r-- | setup.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1464,7 +1464,7 @@ class pyside_build(_build): qt_lib_dir = self.qtinfo.libs_dir if OPTION_STANDALONE: qt_lib_dir = "$ORIGIN/Qt/lib" - final_rpath = local_rpath + ':' + qt_lib_dir + final_rpath = local_rpath + ':' + qt_lib_dir cmd = [patchelf_path, '--set-rpath', final_rpath, srcpath] if run_process(cmd) != 0: raise RuntimeError("Error patching rpath in " + srcpath) |