From e7aec5302e246819f82b2b7a6e3109ccce3a3b38 Mon Sep 17 00:00:00 2001
From: Mike Krus <mike.krus@kdab.com>
Date: Sun, 24 Jul 2016 14:44:41 +0100
Subject: Use earlyReport to handle incorrect use of RPATH config settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Report error when using RPATH settings on platforms that don’t support
it or when doing static builds

Change-Id: I2ba0c2bff5347170c7fcb339da80ef1f1974d43a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 configure.json | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 260dece2d6..a062477f53 100644
--- a/configure.json
+++ b/configure.json
@@ -1056,20 +1056,13 @@
         },
         "rpath": {
             "description": "Build with RPATH",
-            "condition": [
-                "!config.ios && !config.win32",
-                "var.QMAKE_LFLAGS_RPATH != ''"
-            ],
+            "autoDetect": "var.QMAKE_LFLAGS_RPATH != '' && features.shared",
             "output": [ "publicQtConfig" ]
         },
         "rpath_dir": {
             "description": "RPATH directory",
             "enable": "input.rpaths != ''",
             "autoDetect": false,
-            "condition": [
-                "!config.ios && !config.win32",
-                "var.QMAKE_LFLAGS_RPATH != ''"
-            ],
             "output": [ { "type": "varAppend", "name": "EXTRA_RPATHS", "value": "input.rpaths" } ]
         },
         "rtti": {
@@ -2218,6 +2211,16 @@ Qt can be built in release mode with separate debug information, so
             "type": "error",
             "condition": "input.xcb != '' && input.xcb != 'no' && input.xkbcommon == 'no'",
             "message": "XCB plugin requires libxkbcommon. See -qt-xkbcommon-x11 and -system-xkbcommon-x11."
+        },
+        {
+            "type": "error",
+            "condition": "(features.rpath || features.rpath_dir) && !features.shared",
+            "message": "Static builds don't support RPATH"
+        },
+        {
+            "type": "error",
+            "condition": "(features.rpath || features.rpath_dir) && var.QMAKE_LFLAGS_RPATH == ''",
+            "message": "This platform does not support RPATH"
         }
     ],
 
-- 
cgit v1.2.3