summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetri Latvala <ext-petri.latvala@nokia.com>2010-07-07 13:30:14 (GMT)
committerAdrian Constantin <adrian.constantin@nokia.com>2010-07-16 14:37:13 (GMT)
commitf231bd03007484d239cb5456db9e20a1f9ab7a63 (patch)
tree70bd1b06fe875b21f7f9caa028279181b6b40d59
parent4942890f85e5fa74bf8c37cf7f53f6f3eaf40596 (diff)
downloadQt-f231bd03007484d239cb5456db9e20a1f9ab7a63.zip
Qt-f231bd03007484d239cb5456db9e20a1f9ab7a63.tar.gz
Qt-f231bd03007484d239cb5456db9e20a1f9ab7a63.tar.bz2
Link to the unsinstalled libraries first.
Task-number: QT-3371 Reviewed-by: Harald Fernengel
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 62e0863..fb544bd 100755
--- a/configure
+++ b/configure
@@ -7746,7 +7746,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