diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-05 16:49:25 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-17 16:35:50 +0000 |
commit | 554f365322cd38bd9df2c339a18bd8ba553cabf3 (patch) | |
tree | 5a6d25885b3aac87fd6f759c57f04e1a0f201b04 /qmake/generators | |
parent | f58e95f098c8d78a5f2db7729606126fe093cbdf (diff) |
don't pretend that non-mac supports relative QMAKE_SONAME_PREFIX
unlike in DT_RPATH/DT_RUNPATH and DT_NEEDED, $ORIGIN & co. cannot appear
in DT_SONAME.
Change-Id: I4da23f8419806bdc05d6844ce3397ef43b82914c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 05a090b23a..a310e471ed 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -1330,7 +1330,7 @@ void UnixMakefileGenerator::init2() soname.prepend(instpath); } else if (!project->isEmpty("QMAKE_SONAME_PREFIX")) { QString sonameprefix = project->first("QMAKE_SONAME_PREFIX").toQString(); - if (!sonameprefix.startsWith('@') && !sonameprefix.startsWith('$')) + if (!sonameprefix.startsWith('@')) sonameprefix = Option::fixPathToTargetOS(sonameprefix, false); if (!sonameprefix.endsWith(Option::dir_sep)) sonameprefix += Option::dir_sep; |