diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-03-12 11:03:47 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-12 17:33:15 +0100 |
| commit | 75218e08ab4f6a237d8adde68fbd039a6791600c (patch) | |
| tree | 918d8ffc2e4d6731c6b8bc58868b6a32eae0613e /mkspecs/features/qt_functions.prf | |
| parent | edea0e19173d92526b6f5378a6182f53d29f45e6 (diff) | |
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>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 370187b722..474a414003 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 |