From 872e4b883d7732c46e1e5d32b60ce698862e5da6 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 26 Jun 2018 14:08:26 +0200 Subject: GCC: Do not add non-existing paths to cpp.systemRunPaths Change-Id: Ib8db4e47b9f9982152b46ec7ada4696456185cf4 Reviewed-by: Oswald Buddenhagen Reviewed-by: Christian Stenger --- share/qbs/modules/cpp/UnixGCC.qbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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=" -- cgit v1.2.3