Merge 1.12 into master

Change-Id: Ieaf617a09ed16cf0c81ea7621d4d0ba23741fbfa

4 files changed, 18 insertions, 8 deletions

diff --git a/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs b/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs
index 7037a58cd..8cc55f885 100644
--- a/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs
+++ b/share/qbs/modules/Exporter/pkgconfig/pkgconfig.qbs
@@ -31,11 +31,8 @@ Module {
         requiresInputs: false
 
         // Make sure all relevant library artifacts have been created by the time we run.
-        inputsFromDependencies: autoDetect
-                                ? ["Exporter.pkgconfig.pc", "staticlibrary", "dynamiclibrary"]
-                                : []
-        inputs: {
-            if (!product.Exporter.pkgconfig.autoDetect)
+        auxiliaryInputs: {
+            if (!autoDetect)
                 return undefined;
             if (product.type.contains("staticlibrary"))
                 return ["staticlibrary"];
diff --git a/share/qbs/modules/Exporter/qbs/qbsexporter.qbs b/share/qbs/modules/Exporter/qbs/qbsexporter.qbs
index 093512c6d..861483ef0 100644
--- a/share/qbs/modules/Exporter/qbs/qbsexporter.qbs
+++ b/share/qbs/modules/Exporter/qbs/qbsexporter.qbs
@@ -48,7 +48,9 @@ Module {
         requiresInputs: false
 
         // Make sure we only run when all other artifacts are already present.
-        inputs: product.type.filter(function(t) { return t !== "Exporter.qbs.module"; })
+        // TODO: This also matches target artifacts in dependencies. Should not hurt,
+        //       but might be a hint that we should have auxiliaryInputsFromDependencies.
+        auxiliaryInputs: product.type.filter(function(t) { return t !== "Exporter.qbs.module"; })
 
         Artifact {
             filePath: product.Exporter.qbs.fileName
diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs
index 90df34c24..e5b99cd98 100644
--- a/share/qbs/modules/cpp/UnixGCC.qbs
+++ b/share/qbs/modules/cpp/UnixGCC.qbs
@@ -28,6 +28,8 @@
 **
 ****************************************************************************/
 
+import qbs.File
+
 GenericGCC {
     condition: qbs.toolchain && qbs.toolchain.contains("gcc")
                && qbs.targetOS && qbs.targetOS.contains("unix")
@@ -40,7 +42,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="
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index 896ae48fa..95e3d198c 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -254,6 +254,9 @@ function linkerFlags(project, product, inputs, output, linkerPath) {
     var weakFrameworks = product.cpp.weakFrameworks;
     var rpaths = (product.cpp.useRPaths !== false) ? product.cpp.rpaths : undefined;
     var systemRunPaths = product.cpp.systemRunPaths || [];
+    var canonicalSystemRunPaths = systemRunPaths.map(function(p) {
+        return File.canonicalFilePath(p);
+    });
     var i, args = additionalCompilerAndLinkerFlags(product);
 
     var escapableLinkerFlags = [];
@@ -337,8 +340,12 @@ function linkerFlags(project, product, inputs, output, linkerPath) {
         return rpath;
     }
 
+    function isNotSystemRunPath(p) {
+        return !systemRunPaths.contains(p)
+                && !canonicalSystemRunPaths.contains(File.canonicalFilePath(p));
+    };
     for (i in rpaths) {
-        if (systemRunPaths.indexOf(rpaths[i]) === -1)
+        if (isNotSystemRunPath(rpaths[i]))
             escapableLinkerFlags.push("-rpath", fixupRPath(rpaths[i]));
     }
 
@@ -382,6 +389,8 @@ function linkerFlags(project, product, inputs, output, linkerPath) {
         allLibraryPaths = allLibraryPaths.uniqueConcat(libraryPaths);
     if (distributionLibraryPaths)
         allLibraryPaths = allLibraryPaths.uniqueConcat(distributionLibraryPaths);
+    if (systemRunPaths.length > 0)
+        allLibraryPaths = allLibraryPaths.filter(isNotSystemRunPath);
     args = args.concat(allLibraryPaths.map(function(path) { return '-L' + path }));
 
     var linkerScripts = inputs.linkerscript