summaryrefslogtreecommitdiffstats
path: root/src/core/config
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-09-11 13:31:48 +0200
committerMichal Klocek <michal.klocek@qt.io>2017-09-12 20:38:17 +0000
commit1292b3049b8243a442becf1c3c49c0fa48661e9a (patch)
tree4da1003333ce9940845bff1949881dd16e78b8f0 /src/core/config
parent6bc675d8a7f89cb8c1ce4fc48dfeedcc8028c76f (diff)
Add host-pkg-config to linux configuration
In case of passing pkg_config also set host_pkg_config otherwise pkg-config for sysroot will inject sysroot root libdir linker flag during host build which leads to weird errors. Change-Id: I57f277e500ba175687f65b9947b9f9c8edd969fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/config')
-rw-r--r--src/core/config/linux.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 1cc6065ac..c2d41b4d0 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -119,6 +119,7 @@ host_build {
# Strip '>2 /dev/null' from $$pkgConfigExecutable()
PKGCONFIG = $$first($$list($$pkgConfigExecutable()))
gn_args += pkg_config=\"$$PKGCONFIG\"
+ gn_args += "host_pkg_config=\"pkg-config\""
}
qtConfig(system-zlib): use?(system_minizip): gn_args += use_system_zlib=true use_system_minizip=true