diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-09 15:02:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-11 10:40:23 +0200 |
| commit | b603fd36c256e91beff758363d6943cf2f8294d8 (patch) | |
| tree | e630ac04db6f4c8dea98ef85edf3b629ee73e3dc /configure | |
| parent | 43af0260b8956a04652e7dd1e39814d220413573 (diff) | |
support -rpath for modules which are not installed to QT_INSTALL_PREFIX
a module's project file may set MODULE_INSTALL_LIBS before loading
qt_module.prf to have an alternative RPATH linked into the users of that
module.
this is relevant only for linking against non-installed -prefix builds
of that module, as otherwise .libs from the module's pri file is used
for rpath.
Change-Id: Ib240e748cf130a71a5991dc643c368a983092ead
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -5345,8 +5345,6 @@ fi if [ "$PLATFORM_MAC" = "yes" ] && [ "$QT_CROSS_COMPILE" = "no" ]; 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 @@ -5360,15 +5358,14 @@ elif [ -z "`getXQMakeConf 'QMAKE_(LFLAGS_)?RPATH'`" ]; then CFG_RPATH=no fi else - if [ "$CFG_RPATH" = "yes" ]; then - # set the default rpath to the library installation directory - RPATH_FLAGS="\"$QT_INSTALL_LIBS\" $RPATH_FLAGS" - fi if [ -n "$RPATH_FLAGS" ]; then # add the user defined rpaths QMakeVar add QMAKE_RPATHDIR "$RPATH_FLAGS" fi fi +if [ "$CFG_RPATH" = "yes" ]; then + QT_CONFIG="$QT_CONFIG rpath" +fi if [ '!' -z "$I_FLAGS" ]; then # add the user define include paths |