diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-12-02 11:14:39 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-12-02 11:15:53 +0100 |
| commit | def3d751f1dde03018b6673af8b91089799a1182 (patch) | |
| tree | 7a16cff4f1d2f0c09cef2b6e9fc7bc7ce1562a3c /eclass | |
| parent | cmake-utils.eclass: Revert "Set assembler correctly, #601292" (diff) | |
| download | gentoo-def3d751f1dde03018b6673af8b91089799a1182.tar.gz gentoo-def3d751f1dde03018b6673af8b91089799a1182.tar.bz2 gentoo-def3d751f1dde03018b6673af8b91089799a1182.zip | |
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.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 1305ab2940f2..f2b210392682 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 |