diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-20 16:32:59 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-22 11:48:09 +0000 |
| commit | 4cbec6b7303302a2b3026d5602262e2e9469a0a6 (patch) | |
| tree | bc58fe215144bb3de28254d5c80a262de1c0653d /configure.pri | |
| parent | a71b53d6004edb59ad1801f3281ef631fb38c7c4 (diff) | |
| download | qtbase-4cbec6b7303302a2b3026d5602262e2e9469a0a6.tar.gz | |
configure: reload spec after configuring paths
this fixes the x-build for raspberry pi, as that spec refers to the
sysroot.
the path setup doesn't require the device options to be in effect yet,
so it was sufficient to move the existing spec reload to a later point
in time.
Change-Id: Idc521aa13ff441931e954c7c9004472cf7061ee1
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 7dd1069c0b..10eb8b287e 100644 --- a/configure.pri +++ b/configure.pri @@ -593,9 +593,8 @@ defineTest(qtConfOutput_prepareOptions) { export($${currentConfig}.output.devicePro) - # reload the spec to make the settings actually take effect. - !isEmpty($${currentConfig}.output.devicePro): \ - reloadSpec() + # if any settings were made, the spec will be reloaded later + # to make them take effect. } defineTest(qtConfOutput_machineTuple) { @@ -842,6 +841,15 @@ defineTest(qtConfOutput_preparePaths) { "Prefix=$$QT_SOURCE_TREE" write_file($$QT_BUILD_TREE/bin/qt.conf, cont)|error() reload_properties() + + # if a sysroot was configured, the spec will be reloaded later, + # as some specs contain $$[SYSROOT] references. +} + +defineTest(qtConfOutput_reloadSpec) { + !isEmpty($${currentConfig}.output.devicePro)| \ + !isEmpty(config.input.sysroot): \ + reloadSpec() } defineTest(qtConfOutput_shared) { |