summaryrefslogtreecommitdiff
path: root/share/qbs/modules/cpp/gcc.js
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-08-03 10:48:10 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2018-08-03 12:43:00 +0200
commit51b63d5e805814c1ec88e4a874cd7eabd58eb20a (patch)
tree600a94fe14b9741dc58492df5300265fe284118c /share/qbs/modules/cpp/gcc.js
parentffbc37129d6a2623ddc731520baba0f4d3b6f3b1 (diff)
parent66131652f178cd1605b8a2c0ba7023392e13ad5a (diff)
downloadqbs-51b63d5e805814c1ec88e4a874cd7eabd58eb20a.tar.gz
Merge 1.12 into master
Change-Id: I0ce6c28f9117f945c9fec0654bd06daf3d13ace0
Diffstat (limited to 'share/qbs/modules/cpp/gcc.js')
-rw-r--r--share/qbs/modules/cpp/gcc.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index c3ba53ff2..6e8622b93 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -345,8 +345,8 @@ function linkerFlags(project, product, inputs, outputs, primaryOutput, linkerPat
}
function isNotSystemRunPath(p) {
- return !systemRunPaths.contains(p)
- && !canonicalSystemRunPaths.contains(File.canonicalFilePath(p));
+ return !FileInfo.isAbsolutePath(p) || (!systemRunPaths.contains(p)
+ && !canonicalSystemRunPaths.contains(File.canonicalFilePath(p)));
};
for (i in rpaths) {
if (isNotSystemRunPath(rpaths[i]))