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-rasp-pi3-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-rasp-pi3-g++')
| -rw-r--r-- | mkspecs/devices/linux-rasp-pi3-g++/qmake.conf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf index 10862ccd70..2bb70ffb5a 100644 --- a/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf +++ b/mkspecs/devices/linux-rasp-pi3-g++/qmake.conf @@ -8,13 +8,12 @@ include(../common/linux_device_pre.conf) # and possibly no pkg-config, have some static values as well: # I consider it a bug that this is required, but our EGL config.test _requires_ it -QMAKE_LFLAGS += -Wl,-rpath-link,$$[QT_SYSROOT]/opt/vc/lib +QMAKE_RPATHLINKDIR_POST += $$[QT_SYSROOT]/opt/vc/lib VC_LIBRARY_PATH = /opt/vc/lib VC_INCLUDE_PATH = =/opt/vc/include -# terrible, they do not appear to resolve "=" in rpath! -VC_LINK_LINE = -L=$${VC_LIBRARY_PATH} -Wl,-rpath-link,$$[QT_SYSROOT]$${VC_LIBRARY_PATH} +VC_LINK_LINE = -L=$${VC_LIBRARY_PATH} QMAKE_LIBDIR_OPENGL_ES2 = =$${VC_LIBRARY_PATH} QMAKE_LIBDIR_EGL = $$QMAKE_LIBDIR_OPENGL_ES2 |