aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2012-10-02 13:42:05 (GMT)
committerMichael Palimaka <kensington@gentoo.org>2012-10-02 13:42:05 (GMT)
commitf2c469d29e3609521229a0704dee4a1e27be1543 (patch)
tree73bd82a3087e196c6b01c4eb9e708eabd1c1064e
parent[eclass] Return status at the end of CMake test phase. This fixes bug #406353. (diff)
downloadkde-f2c469d29e3609521229a0704dee4a1e27be1543.zip
kde-f2c469d29e3609521229a0704dee4a1e27be1543.tar.gz
kde-f2c469d29e3609521229a0704dee4a1e27be1543.tar.bz2
[eclass] Use fully-qualified values for ar and ranlib, wrt bug #436070.
-rw-r--r--eclass/cmake-utils.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 2463bc5..77653ff 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 "<CMAKE_C_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
SET (CMAKE_CXX_COMPILER $(type -P $(tc-getCXX)) CACHE FILEPATH "C++ compiler" FORCE)
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" 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=