introduce cpp.useRPaths

Set this property to false to prevent the linker from writing
rpaths to the binary.

Task-number: QBS-594
Change-Id: Ife1ad9fa40bc2b792bf78af4f349fe6a80095d35
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 766a8fa73..7634b8495 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -101,6 +101,7 @@ Module {
     property stringList frameworks // list of frameworks, will be linked with '-framework <name>'
     property stringList weakFrameworks // list of weakly-linked frameworks, will be linked with '-weak_framework <name>'
     property stringList rpaths
+    property bool useRPaths: true
 
     property stringList cppFlags
     PropertyOptions {
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 9045da4e6..232d27bc7 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -10,7 +10,8 @@ function linkerFlags(product, inputs) {
     var linkerScripts = ModUtils.moduleProperties(product, 'linkerScripts');
     var frameworks = ModUtils.moduleProperties(product, 'frameworks');
     var weakFrameworks = ModUtils.moduleProperties(product, 'weakFrameworks');
-    var rpaths = ModUtils.moduleProperties(product, 'rpaths');
+    var rpaths = (product.moduleProperty("cpp", "useRPaths") !== false)
+            ? ModUtils.moduleProperties(product, 'rpaths') : undefined;
     var args = [], i, prefix, suffix, suffixes;
 
     if (rpaths && rpaths.length)