From 205987750d51a446118f50b9ed583d40a565f445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Tue, 19 Jan 2016 16:48:40 +0100 Subject: 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 --- mkspecs/devices/common/linux_device_pre.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/devices') 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 -- cgit v1.2.3