summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-03-19 13:32:31 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-19 04:46:15 +0100
commit25e004bfe493e18be255b057ae5c132a5ec5458b (patch)
treeb84e687df23d75df340fedf20521288e73249fae
parent0f929bfa9aa76d7db54a62c6a571e97224384ec1 (diff)
Set RPATH_FLAGS on Mac too
Without this, QMAKE_RPATHDIR is empty and qt_module.prf's logic to turn on absolute_library_soname fails, causing some modules to build without absolute paths (eg. qtjsbackend's QtV8 framework). Change-Id: If03136ca60a5d8a96a589e2d1034e5884fd6a1ac Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
-rwxr-xr-xconfigure2
1 files changed, 2 insertions, 0 deletions
diff --git a/configure b/configure
index a4d724efae..8164badeba 100755
--- a/configure
+++ b/configure
@@ -5722,6 +5722,8 @@ fi
if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_RPATH" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
+ # set the default rpath to the library installation directory
+ RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS"
fi
elif [ -z "`getXQMakeConf 'QMAKE_(LFLAGS_)?RPATH'`" ]; then
if [ -n "$RPATH_FLAGS" ]; then