diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-16 18:06:24 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-31 12:57:14 +0000 |
commit | 5afde92bd76421a49b9eb76e6071b32fd3ca41df (patch) | |
tree | 532cb98da7b60265d8940f28cd83d33f62827796 /qmake/generators/unix/unixmake.cpp | |
parent | 6dcd944deeed28bdd001eea5289d04116c9d23f4 (diff) |
make mkspecs not mess up -rpath-link
adding shared install paths via QMAKE_LFLAGS in the spec has the tiny
side effect that they are searched _first_, which is generally a really
bad idea - they should be _last_.
for that purpose, introduce QMAKE_RPATHLINKDIR_POST, and migrate all
specs to use it.
QMAKE_RPATHDIR_POST is added for consistency, but not actually used.
Task-number: QTBUG-59457
Change-Id: Iac6cda5e9111ef8cca454a69861fe8408bb40589
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/generators/unix/unixmake.cpp')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 2f1bbeea25..30f99174f8 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -96,6 +96,8 @@ UnixMakefileGenerator::init() project->values("QMAKE_LFLAGS") += project->values("QMAKE_LFLAGS_PREBIND"); project->values("QMAKE_INCDIR") += project->values("QMAKE_INCDIR_POST"); project->values("QMAKE_LIBDIR") += project->values("QMAKE_LIBDIR_POST"); + project->values("QMAKE_RPATHDIR") += project->values("QMAKE_RPATHDIR_POST"); + project->values("QMAKE_RPATHLINKDIR") += project->values("QMAKE_RPATHLINKDIR_POST"); if(!project->isEmpty("QMAKE_INCDIR")) project->values("INCLUDEPATH") += project->values("QMAKE_INCDIR"); ProStringList ldadd; |