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.
hanetzer · Dec 2, 2016 · def3d75 · def3d75
1 parent 14bbe0b
commit def3d75
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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