From: Sean Harmer <sean.harmer.qnx@kdab.com>
Date: Mon, 12 Mar 2012 11:03:47 +0000 (+0000)
Subject: Do not add -rpath-link directives with no library path
X-Git-Tag: qt-v5.0.0-alpha1~364
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75218e08ab4f6a237d8adde68fbd039a6791600c;p=profile%2Fivi%2Fqtbase.git

Do not add -rpath-link directives with no library path

Doing so works fine on Linux as g++ version there silently ignores
this. However, the qcc toolchain for QNX barfs.

Change-Id: Ia236910adc09dc1653e4169e20476b69c2de62ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---

diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 370187b..474a414 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -132,9 +132,11 @@ defineTest(qtAddModule) {
 
     isEmpty(LINKAGE) {
        # Make sure we can link to uninstalled libraries
-       !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
-           QMAKE_LIBDIR *= $$MODULE_LIBS
-           unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+       !isEmpty(MODULE_LIBS) {
+           !isEqual(MODULE_LIBS, $$[QT_INSTALL_LIBS]) { ### XXX
+               QMAKE_LIBDIR *= $$MODULE_LIBS
+               unix:!mac:QMAKE_LFLAGS *= "-Wl,-rpath-link,$$MODULE_LIBS"
+           }
        }
        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
            win32:LINKAGE = -l$${MODULE_NAME}$${QT_LIBINFIX}d