AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set RPATH_FLAGS on Mac too

Browse Source 
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>
This commit is contained in:
Lincoln Ramsay 2012-03-19 13:32:31 +10:00 committed by Qt by Nokia
parent 0f929bfa9a
commit 25e004bfe4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -5722,6 +5722,8 @@ fi
if [ "$PLATFORM_MAC" = "yes" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_RPATH" = "yes" ]; then if [ "$CFG_RPATH" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname" QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
# set the default rpath to the library installation directory
RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS"
fi fi
elif [ -z "`getXQMakeConf 'QMAKE_(LFLAGS_)?RPATH'`" ]; then elif [ -z "`getXQMakeConf 'QMAKE_(LFLAGS_)?RPATH'`" ]; then
if [ -n "$RPATH_FLAGS" ]; then if [ -n "$RPATH_FLAGS" ]; then