diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-02-08 10:55:01 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-09 04:07:36 +0000 |
| commit | 7604806e71e6b7931b3ea06ed3aa9aae33ac5883 (patch) | |
| tree | 32555a47c29961d57c548cde46fb7e2425914c7b | |
| parent | f9858ee2f51095e84602156a29d9d9a57a607045 (diff) | |
Ignore PKG_CONFIG* shell exports for Yocto
Yocto sets GN_HOST_PKG_CONFIG script for native
tools builds, therefore skip host pkg-config script
generation even if PKG_CONFIG* shell variables for target
are exported.
Task-number: QTBUG-66275
Change-Id: I4a9939cd67ca5f32faeb827b5df0d3274ae7c30e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | src/core/config/linux.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index d337f686f..1ce3ea89d 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -115,12 +115,12 @@ host_build { PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST) pkgConfigLibDir = $$(PKG_CONFIG_LIBDIR) pkgConfigSysrootDir = $$(PKG_CONFIG_SYSROOT_DIR) - isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST - cross_compile { + isEmpty(PKG_CONFIG_HOST): cross_compile { !isEmpty(pkgConfigLibDir)|!isEmpty(pkgConfigSysrootDir) { PKG_CONFIG_HOST = $$pkgConfigHostExecutable() } } + isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = $$QMAKE_PKG_CONFIG_HOST gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\" } |