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-jetson-tx1-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-jetson-tx1-g++')
| -rw-r--r-- | mkspecs/devices/linux-jetson-tx1-g++/qmake.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf b/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf index f45be457fd..f9dec441f6 100644 --- a/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf +++ b/mkspecs/devices/linux-jetson-tx1-g++/qmake.conf @@ -34,11 +34,11 @@ QMAKE_LIBDIR_POST += \ $$[QT_SYSROOT]/lib/aarch64-linux-gnu \ $$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu -QMAKE_LFLAGS += \ - -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib \ - -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu \ - -Wl,-rpath-link,$$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu/tegra \ - -Wl,-rpath-link,$$[QT_SYSROOT]/lib/aarch64-linux-gnu +QMAKE_RPATHLINKDIR_POST += \ + $$[QT_SYSROOT]/usr/lib \ + $$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu \ + $$[QT_SYSROOT]/usr/lib/aarch64-linux-gnu/tegra \ + $$[QT_SYSROOT]/lib/aarch64-linux-gnu DISTRO_OPTS += aarch64 COMPILER_FLAGS += -mtune=cortex-a57.cortex-a53 -march=armv8-a |