From be6758a4de9ec9d51adf17d256de2f69edecdb00 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 23 Sep 2015 18:29:02 +0200
Subject: omit trailing /. from relative RPATHs pointing to own directory

Change-Id: Ia4551f5b16f4e66c7ab7fdec82643d9cd8866ccd
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 mkspecs/features/qt.prf | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'mkspecs')

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]
     }
-- 
cgit v1.2.3