summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-11-08 09:34:15 +0100
committerLars Knoll <lars.knoll@qt.io>2017-11-22 07:59:04 +0000
commita04dfb3e91743f01b39bfb63a4a74aab498d37fa (patch)
treeff92c493de3918c65fff9d773a4d464e7b1750a4
parentbeb152924667f10059b8aa7354a07e04ac25d8cd (diff)
Add GN_PKG_CONFIG_HOST to set host pkg-config
Yocto builds need to pass pkg-config-native to build natvie tools. Task-number: QTBUG-63140 Change-Id: I75ef77461b56bd599240da95df13261aa9e4be75 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/config/linux.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index fd22c880f..6f7b27f10 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -112,7 +112,9 @@ host_build {
# Strip '>2 /dev/null' from $$pkgConfigExecutable()
PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
gn_args += pkg_config=\"$$PKGCONFIG\"
- gn_args += host_pkg_config=\"pkg-config\"
+ PKG_CONFIG_HOST = $$(GN_PKG_CONFIG_HOST)
+ isEmpty(PKG_CONFIG_HOST): PKG_CONFIG_HOST = pkg-config
+ gn_args += host_pkg_config=\"$$PKG_CONFIG_HOST\"
}
qtConfig(webengine-system-zlib): qtConfig(webengine-system-minizip) {