diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-26 14:08:26 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-28 11:36:50 +0000 |
| commit | 872e4b883d7732c46e1e5d32b60ce698862e5da6 (patch) | |
| tree | 38dc9246877fcd7107bca04b4ed999f83a3b223d | |
| parent | 8d75be48c2bbe314390ff292e3a26c5403a5896a (diff) | |
GCC: Do not add non-existing paths to cpp.systemRunPaths
Change-Id: Ib8db4e47b9f9982152b46ec7ada4696456185cf4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/UnixGCC.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs index 3ac279b26..ec26cffb6 100644 --- a/share/qbs/modules/cpp/UnixGCC.qbs +++ b/share/qbs/modules/cpp/UnixGCC.qbs @@ -29,6 +29,7 @@ ****************************************************************************/ import qbs 1.0 +import qbs.File GenericGCC { condition: qbs.toolchain && qbs.toolchain.contains("gcc") @@ -42,7 +43,7 @@ GenericGCC { dynamicLibrarySuffix: ".so" debugInfoSuffix: ".debug" imageFormat: "elf" - systemRunPaths: ["/lib", "/usr/lib"] + systemRunPaths: ["/lib", "/usr/lib"].filter(function(p) { return File.exists(p); }) rpathOrigin: "$ORIGIN" useRPathLink: true rpathLinkFlag: "-rpath-link=" |