diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-23 18:29:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-01 16:18:58 +0000 |
| commit | be6758a4de9ec9d51adf17d256de2f69edecdb00 (patch) | |
| tree | 27557a6357c67052dec176cf1ff4a10bad73c100 /mkspecs/features | |
| parent | 1ebce824c4d5d30fbc54ce553ba8d109a68e04c2 (diff) | |
omit trailing /. from relative RPATHs pointing to own directory
Change-Id: Ia4551f5b16f4e66c7ab7fdec82643d9cd8866ccd
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt.prf | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 367e3799ef..a8d317a0e3 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -173,11 +173,17 @@ qt_module_deps = $$resolve_depends(qt_module_deps, "QT.") } else { binpath = $$target.path } - QMAKE_RPATHDIR += @loader_path/$$relative_path($$[QT_INSTALL_LIBS], $$binpath) + rpath = @loader_path } else { QMAKE_LFLAGS += -Wl,-z,origin - QMAKE_RPATHDIR += $ORIGIN/$$relative_path($$[QT_INSTALL_LIBS], $$target.path) + binpath = $$target.path + rpath = $ORIGIN } + # NOT the /dev property, as INSTALLS use host paths + relpath = $$relative_path($$[QT_INSTALL_LIBS], $$binpath) + !equals(relpath, .): \ + rpath = $$rpath/$$relpath + QMAKE_RPATHDIR += $$rpath } else { QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] } |