Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 27 Nov 2016 11:42:51
Message-Id: 1480246959.5132424e609fe2df9cd7916bc8dc4db70001b77d.mgorny@gentoo
1 commit: 5132424e609fe2df9cd7916bc8dc4db70001b77d
2 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 2 02:31:56 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 11:42:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5132424e
7
8 cmake-utils.eclass: export CC/CXX/FC to environment, #542530
9
10 eclass/cmake-utils.eclass | 6 +++---
11 1 file changed, 3 insertions(+), 3 deletions(-)
12
13 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
14 index 1cf08cd..0528432 100644
15 --- a/eclass/cmake-utils.eclass
16 +++ b/eclass/cmake-utils.eclass
17 @@ -526,13 +526,13 @@ enable_cmake-utils_src_configure() {
18
19 local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
20 cat > ${toolchain_file} <<- _EOF_ || die
21 - SET (CMAKE_C_COMPILER $(tc-getCC))
22 - SET (CMAKE_CXX_COMPILER $(tc-getCXX))
23 - SET (CMAKE_Fortran_COMPILER $(tc-getFC))
24 SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE)
25 SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE)
26 _EOF_
27
28 + # Bug 542530, export those instead of setting paths in toolchain file
29 + local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC)
30 +
31 if tc-is-cross-compiler; then
32 local sysname
33 case "${KERNEL:-linux}" in