[patch] patch

0002-cmake-utils.eclass-export-compilers-to-environment-i.patch (text/plain), 1.16 KB, created by Maciej Mrozowski on 2016-11-02 03:02:36 UTC

From 3121f28a66fcc9358c0a4388e33a38e557e91f9e Mon Sep 17 00:00:00 2001
From: Maciej Mrozowski <[e-mail]>
Date: Wed, 2 Nov 2016 03:31:56 +0100
Subject: [PATCH 2/2] cmake-utils.eclass: export compilers to environment
 instead of setting in toolchain file, bug 542530

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

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index 88d2163..f7eac26 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -525,13 +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
+	tc-export CC CXX FC
+
 	if tc-is-cross-compiler; then
 		local sysname
 		case "${KERNEL:-linux}" in
-- 
2.7.3