diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-12-15 17:52:47 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-01-23 17:00:53 +0000 |
| commit | d502c6e9d09803dd268100f8c53cf7bc563e3d1d (patch) | |
| tree | f998c3179401c09e4399015b19e34593f12ef3c5 /configure.pri | |
| parent | 3cec2ccb0ffdd41a41ab55d4c1ba88d4866e71d1 (diff) | |
Add pkg-host wrapper script
Currently we need pkg-config host for cross-builds to build
build tools. Unfortunately if build environment exports
PKG_CONFIG_* variables pkg-config will pick them up also for host builds,
which can lead to compile errors. Create pkg-config-host_wrapper
which explicitly unsets PKG_CONFIG_* variables.
This is a temporary workaround till proper solution is implemented
in qtbase.
Task-number: QTBUG-65079
Change-Id: I9aff4a27ba62e096ed4c023cf022a41833260178
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 497557262..ecf2ce4d3 100644 --- a/configure.pri +++ b/configure.pri @@ -157,6 +157,20 @@ defineTest(qtConfTest_detectIcuuc) { return(false) } +defineTest(qtConfTest_detectHostPkgConfig) { + PKG_CONFIG = $$qtConfPkgConfig(true) + isEmpty(PKG_CONFIG) { + qtLog("Could not find host pkg-config") + return(false) + } + qtLog("Found host pkg-config: $$PKG_CONFIG") + $${1}.path = $$PKG_CONFIG + export($${1}.path) + $${1}.cache += path + export($${1}.cache) + return(true) +} + defineTest(qtConfTest_isSanitizerSupported) { sanitizer_combo_supported = true |