| 1 |
commit: def3d751f1dde03018b6673af8b91089799a1182 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 2 10:14:39 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 2 10:15:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def3d751 |
| 7 |
|
| 8 |
cmake-utils.eclass: Revert "export CC/CXX/FC to environment, #542530" |
| 9 |
|
| 10 |
Revert using CC/CXX/FC envvars since it breaks implicit assembler |
| 11 |
override and is non-trivial to fix, #601292. |
| 12 |
|
| 13 |
eclass/cmake-utils.eclass | 5 +++-- |
| 14 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 17 |
index 1305ab2..f2b2103 100644 |
| 18 |
--- a/eclass/cmake-utils.eclass |
| 19 |
+++ b/eclass/cmake-utils.eclass |
| 20 |
@@ -525,12 +525,13 @@ enable_cmake-utils_src_configure() { |
| 21 |
|
| 22 |
local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake |
| 23 |
cat > ${toolchain_file} <<- _EOF_ || die |
| 24 |
+ SET (CMAKE_C_COMPILER $(tc-getCC)) |
| 25 |
+ SET (CMAKE_CXX_COMPILER $(tc-getCXX)) |
| 26 |
+ SET (CMAKE_Fortran_COMPILER $(tc-getFC)) |
| 27 |
SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) |
| 28 |
SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) |
| 29 |
_EOF_ |
| 30 |
|
| 31 |
- # Bug 542530, export those instead of setting paths in toolchain file |
| 32 |
- local -x CC=$(tc-getCC) CXX=$(tc-getCXX) FC=$(tc-getFC) |
| 33 |
local -x PKG_CONFIG=$(tc-getPKG_CONFIG) |
| 34 |
|
| 35 |
if tc-is-cross-compiler; then |
Archives