From f2c469d29e3609521229a0704dee4a1e27be1543 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Tue, 2 Oct 2012 23:42:05 +1000 Subject: [eclass] Use fully-qualified values for ar and ranlib, wrt bug #436070. --- eclass/cmake-utils.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 2463bc5098..77653fff85 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -327,13 +327,15 @@ enable_cmake-utils_src_configure() { fi fi - # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS) + # Prepare Gentoo override rules (set valid compiler, append CPPFLAGS etc.) local build_rules=${CMAKE_BUILD_DIR}/gentoo_rules.cmake cat > "${build_rules}" <<- _EOF_ + SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_C_COMPILER $(type -P $(tc-getCC)) CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT " ${CPPFLAGS} -o -c " CACHE STRING "C++ compile command" FORCE) + SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) _EOF_ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= -- cgit v1.2.3-65-gdbad