[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     def3d751f1dde03018b6673af8b91089799a1182
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 10:14:39 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 10:15:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def3d751

cmake-utils.eclass: Revert "export CC/CXX/FC to environment, #542530"

Revert using CC/CXX/FC envvars since it breaks implicit assembler
override and is non-trivial to fix, #601292.

 eclass/cmake-utils.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 1305ab2..f2b2103 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -525,12 +525,13 @@ enable_cmake-utils_src_configure() {
 
        local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
        cat > ${toolchain_file} <<- _EOF_ || die
+               SET (CMAKE_C_COMPILER $(tc-getCC))
+               SET (CMAKE_CXX_COMPILER $(tc-getCXX))
+               SET (CMAKE_Fortran_COMPILER $(tc-getFC))
                SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive 
manager" FORCE)
                SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH 
"Archive index generator" FORCE)
        _EOF_
 
-       # 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