summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2012-03-16 14:14:53 +0000
committerQt by Nokia <qt-info@nokia.com>2012-03-17 01:52:03 +0100
commit42a7eb8df61d280fed1f9cafe9588f7da6dd3f0e (patch)
tree894189b04fb317d7525fdd82dac08eb600883400 /dist
parentb84ff8525cc9ec08de710a8c1fed8d88f44f6543 (diff)
Ensure QMAKE_RFLAGSDIR is set correctly
This patch ensures that additional runpaths passed to configure via the -R switch are added to the QMAKE_RFLAGSDIR variable. Previously, although runpaths provided in this way were appended to the linker options when building Qt itself, they were not appended to the QMAKE_RFLAGSDIR value written to mkspecs/qconfig.pri. This meant that the DT_RPATH attribute was set incorrectly in binaries built from projects other than Qt itself. ----------------------------------------------------------------------- Configure flags Expected value Value before this fix ----------------------------------------------------------------------- <none> DEFAULT_RPATH DEFAULT_RPATH -no-rpath <empty> <empty> -R X DEFAULT_RPATH:X DEFAULT_RPATH -no-rpath -R X X <empty> -prefix Y Y/lib Y/lib -prefix Y -no-rpath <empty> <empty> -prefix Y -R X Y/lib:X Y/lib -prefix Y -no-rpath -R X X <empty> ----------------------------------------------------------------------- DEFAULT_RPATH = /usr/local/Qt-${QT_VERSION}/lib Change-Id: Iaf1809b528ebd249694cf41e004173e881ca48ad Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions