From 66483a93354c105dd01ec5595e9ffdc870856de8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 27 Nov 2016 12:26:19 +0100 Subject: [PATCH] cmake-utils.eclass: Export PKG_CONFIG as envvar rather than build rule --- eclass/cmake-utils.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT " ${includes} ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) SET (CMAKE_Fortran_COMPILE_OBJECT " ${includes} ${FCFLAGS} -o -c " 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 -- 2.26.2