From c748cf489cfc2ac29adaf23296bf3febb946189b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 23 Jul 2012 14:04:43 +0200 Subject: [PATCH] don't set -rpath-link in qmodule.pri qt.prf takes care of that already Change-Id: Ibc426583a007edbbe2f53cc21ce676eb60b33485 Reviewed-by: Joerg Bornemann --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index c91dc2d5a3f..3f18603e3eb 100755 --- 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