summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Stromme <christian.stromme@theqtcompany.com>2015-12-07 22:09:35 +0100
committerChristian Stromme <christian.stromme@theqtcompany.com>2015-12-09 12:18:32 +0000
commit6e6f27b6ec4455bf42343bac575109ed1de20c3a (patch)
tree9efdc5b64bbba534427ef1561783d3ac7f941dc1
parentb4d3f9bd82afed69036015fbfe71526050e0effb (diff)
Use CROSS_COMPILE when setting PKG_CONFIG.
If CROSS_COMPILE is set on a Debian multiarch platform, then PKG_CONFIG should be set the same way as the other cross compilation tools. Change-Id: Id359a6bbdcbf8a136a0268a82301fc086a2adcfe Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/devices/common/linux_device_pre.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index 16becbdd52..cfbdc23d63 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -23,3 +23,6 @@ QMAKE_AR = $${CROSS_COMPILE}ar cqs
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
QMAKE_STRIP = $${CROSS_COMPILE}strip
+
+contains(DISTRO_OPTS, deb-multi-arch): \
+ PKG_CONFIG = $${CROSS_COMPILE}pkg-config