diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-21 11:32:36 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-22 13:03:16 +0000 |
| commit | 23439cb9211fedd9e429c64709f950061cd71da9 (patch) | |
| tree | fe7cd9b8cbdcb9ed51edf0ad1393c1ad36eb0fc4 | |
| parent | 1a29914c17bbec1e98df4dd21390b54499a59c90 (diff) | |
Cpp Module: Remove default rpath entry for Linux
It is unclear why that was added in the first place; there is no
apparent reason why every Linux application should have
"$ORIGIN" in its rpath.
Task-number: QBS-1035
Change-Id: Ibdf631f394bda4df4461d47aaa4ee13fe0a2f00c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/LinuxGCC.qbs | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/plugin-meta-data/plugin-meta-data.qbs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/LinuxGCC.qbs b/share/qbs/modules/cpp/LinuxGCC.qbs index 254b57592..a25445565 100644 --- a/share/qbs/modules/cpp/LinuxGCC.qbs +++ b/share/qbs/modules/cpp/LinuxGCC.qbs @@ -34,7 +34,6 @@ import qbs.Process UnixGCC { condition: qbs.targetOS.contains('linux') && !qbs.targetOS.contains("android") && qbs.toolchain && qbs.toolchain.contains('gcc') - rpaths: ['$ORIGIN'] targetVendor: "pc" targetSystem: "linux" diff --git a/tests/auto/blackbox/testdata/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata/plugin-meta-data/plugin-meta-data.qbs index baaf0844c..81069beaa 100644 --- a/tests/auto/blackbox/testdata/plugin-meta-data/plugin-meta-data.qbs +++ b/tests/auto/blackbox/testdata/plugin-meta-data/plugin-meta-data.qbs @@ -7,7 +7,7 @@ Project { Depends { name: "thePlugin" } cpp.cxxLanguageVersion: "c++11" - cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path"] : undefined + cpp.rpaths: qbs.targetOS.contains("darwin") ? ["@loader_path"] : ["$ORIGIN"] Group { fileTagsFilter: product.type |