summaryrefslogtreecommitdiffstats
path: root/mkspecs/devices
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@theqtcompany.com>2016-01-19 16:48:40 +0100
committerChristian Stromme <christian.stromme@theqtcompany.com>2016-01-21 08:53:05 +0000
commit205987750d51a446118f50b9ed583d40a565f445 (patch)
tree38cf2f5485f22c311266d0d290ec0aa403f4fbf4 /mkspecs/devices
parent1185c28f2f408d858c148062bb0125974905ef22 (diff)
Make pkgConfigExecutable() work when a pkg-config is defined in the spec
Commit 6e6f27b6 made it possible to set the PKG_CONFIG variable using CROSS_COMPILE as a prefix. The problem with that solution is that it makes pkgConfigExecutable() skip the environment setup for pkg-config as well, as it expects the pre-set command to be self-contained - which it isn't. To avoid this problem we need to store the pkg-config define in the device spec in a separate variable. Change-Id: Id8ae7fb03d9253be55840e23fe73b30815ee86c3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/devices')
-rw-r--r--mkspecs/devices/common/linux_device_pre.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index cfbdc23d63..8c6c87d0b7 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -25,4 +25,4 @@ QMAKE_NM = $${CROSS_COMPILE}nm -P
QMAKE_STRIP = $${CROSS_COMPILE}strip
contains(DISTRO_OPTS, deb-multi-arch): \
- PKG_CONFIG = $${CROSS_COMPILE}pkg-config
+ QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config