diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-29 20:06:05 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-20 17:18:16 +0000 |
| commit | 2d8801a9622ca47e377dfb7e1cb73f1809c764ed (patch) | |
| tree | 8cde178b850fb09fcddb5809ac8af4dcd41bf8e9 /mkspecs/common/linux.conf | |
| parent | bf929938293abd398c2c6f3e88c4774e56f75efa (diff) | |
support relative paths in QMAKE_RPATHDIR
... and make use of it in qt.prf.
[ChangeLog][qmake][Unix] Added support for relative paths in
QMAKE_RPATHDIR.
Note that this technically breaks backwards compatibility, as relative
paths were previously silently resolved against $$_PRO_FILE_PWD_. This
was not documented and seems rather useless, so i'm not worried.
Change-Id: I855042a8962ab34ad4617899a5b9825af0087f8a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/common/linux.conf')
| -rw-r--r-- | mkspecs/common/linux.conf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index b98d9bdf2d..143df704b1 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -10,6 +10,9 @@ QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections +QMAKE_LFLAGS_REL_RPATH = -Wl,-z,origin +QMAKE_REL_RPATH_BASE = $ORIGIN + QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = |