commit: 66483a93354c105dd01ec5595e9ffdc870856de8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 11:26:19 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 11:42:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66483a93
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 0528432..bf78cc3 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
