diff options
author | Petri Latvala <ext-petri.latvala@nokia.com> | 2010-07-07 13:30:14 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-08-30 07:51:45 (GMT) |
commit | 8b2b26b3e45f58ce184f45d806093eae17ad657b (patch) | |
tree | b34ad25a9fa58ab27984959ef56c8884700a7655 | |
parent | 33a34960328cce7a6994d2ea771c82da7bfdb598 (diff) | |
download | Qt-8b2b26b3e45f58ce184f45d806093eae17ad657b.zip Qt-8b2b26b3e45f58ce184f45d806093eae17ad657b.tar.gz Qt-8b2b26b3e45f58ce184f45d806093eae17ad657b.tar.bz2 |
Link to the unsinstalled libraries first.
Task-number: QT-3371
Reviewed-by: Harald Fernengel
(cherry picked from commit f231bd03007484d239cb5456db9e20a1f9ab7a63)
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7762,7 +7762,7 @@ EOF # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then - echo "QMAKE_LFLAGS += -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib" >> "$CACHEFILE.tmp" + echo "QMAKE_LFLAGS = -Wl,-rpath-link,\$\$QT_BUILD_TREE/lib \$\$QMAKE_LFLAGS" >> "$CACHEFILE.tmp" fi if [ -n "$QT_CFLAGS_PSQL" ]; then |