don't set -rpath-link in qmodule.pri
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Mon, 23 Jul 2012 12:04:43 +0000 (14:04 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 31 Jul 2012 09:17:46 +0000 (11:17 +0200)
qt.prf takes care of that already

Change-Id: Ibc426583a007edbbe2f53cc21ce676eb60b33485
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
configure

index c91dc2d..3f18603 100755 (executable)
--- a/configure
+++ b/configure
@@ -5948,10 +5948,6 @@ QTMODULE="$outpath/mkspecs/qmodule.pri"
 echo "CONFIG += $QMAKE_CONFIG create_prl link_prl" >> "$QTMODULE.tmp"
 echo "QT_BUILD_PARTS += $CFG_BUILD_PARTS" >> "$QTMODULE.tmp"
 
-# Ensure we can link to uninistalled libraries
-if [ "$BUILD_ON_MAC" != "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
-    echo "QMAKE_LFLAGS    = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$QTMODULE.tmp"
-fi
 if [ -n "$QT_CFLAGS_PSQL" ]; then
     echo "QT_CFLAGS_PSQL   = $QT_CFLAGS_PSQL" >> "$QTMODULE.tmp"
 fi