diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-07-23 14:04:43 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 11:17:46 +0200 |
| commit | c748cf489cfc2ac29adaf23296bf3febb946189b (patch) | |
| tree | be23afe36cd4989aa03d2fcdf2df18e82e61ed19 /configure | |
| parent | c5954051240ede8b182f96db3ea16be4ac75091c (diff) | |
don't set -rpath-link in qmodule.pri
qt.prf takes care of that already
Change-Id: Ibc426583a007edbbe2f53cc21ce676eb60b33485
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 |