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 /mkspecs/devices/linux-snowball-g++ | |
| 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 'mkspecs/devices/linux-snowball-g++')
| -rw-r--r-- | mkspecs/devices/linux-snowball-g++/qmake.conf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf index 9791119363..ff0f3ab1ae 100644 --- a/mkspecs/devices/linux-snowball-g++/qmake.conf +++ b/mkspecs/devices/linux-snowball-g++/qmake.conf @@ -27,7 +27,8 @@ QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy QMAKE_NM = $${CROSS_COMPILE}nm -P QMAKE_STRIP = $${CROSS_COMPILE}strip -QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf \ - -Wl,-rpath-link,$$[QT_SYSROOT]/lib/arm-linux-gnueabihf +QMAKE_RPATHLINKDIR_POST += \ + $$[QT_SYSROOT]/usr/lib/arm-linux-gnueabihf \ + $$[QT_SYSROOT]/lib/arm-linux-gnueabihf load(qt_config) |