diff options
| author | Mike Krus <mike.krus@kdab.com> | 2016-07-24 14:44:41 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-07-26 13:34:09 +0000 |
| commit | e7aec5302e246819f82b2b7a6e3109ccce3a3b38 (patch) | |
| tree | 7167c20d58d85758a7bb790f5500994239a6d694 /configure.json | |
| parent | b3959b515fce642b4f873a25f1c13c604512d9fe (diff) | |
Use earlyReport to handle incorrect use of RPATH config settings
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>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 19 |
1 files changed, 11 insertions, 8 deletions
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" } ], |