From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 27 Nov 2016 11:26:19 +0000 (+0100)
Subject: cmake-utils.eclass: Export PKG_CONFIG as envvar rather than build rule
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66483a93354c105dd01ec5595e9ffdc870856de8;p=gentoo.git

cmake-utils.eclass: Export PKG_CONFIG as envvar rather than build rule
---

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 0528432d81eb..bf78cc30a880 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -521,7 +521,6 @@ enable_cmake-utils_src_configure() {
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
-		SET (PKG_CONFIG_EXECUTABLE $(type -P $(tc-getPKG_CONFIG)) CACHE FILEPATH "pkg-config executable" FORCE)
 	_EOF_
 
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
@@ -532,6 +531,7 @@ enable_cmake-utils_src_configure() {
 
 	# Bug 542530, export those instead of setting paths in toolchain file
 	local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC)
+	local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
 
 	if tc-is-cross-compiler; then
 		local sysname