1 |
On środa, 2 listopada 2016 04:00:06 CET Maciej Mrozowski wrote: |
2 |
> --- |
3 |
> eclass/cmake-utils.eclass | 6 +++--- |
4 |
> 1 file changed, 3 insertions(+), 3 deletions(-) |
5 |
> |
6 |
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
7 |
> index 88d2163..f7eac26 100644 |
8 |
> --- a/eclass/cmake-utils.eclass |
9 |
> +++ b/eclass/cmake-utils.eclass |
10 |
> @@ -525,13 +525,13 @@ enable_cmake-utils_src_configure() { |
11 |
> |
12 |
> local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake |
13 |
> cat > ${toolchain_file} <<- _EOF_ || die |
14 |
> - SET (CMAKE_C_COMPILER $(tc-getCC)) |
15 |
> - SET (CMAKE_CXX_COMPILER $(tc-getCXX)) |
16 |
> - SET (CMAKE_Fortran_COMPILER $(tc-getFC)) |
17 |
> SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive |
18 |
> manager" FORCE) |
19 |
> SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive |
20 |
> index generator" FORCE) |
21 |
> _EOF_ |
22 |
> |
23 |
> + # Bug 542530, export those instead of setting paths in toolchain file |
24 |
> + tc-export CC CXX FC |
25 |
> + |
26 |
> if tc-is-cross-compiler; then |
27 |
> local sysname |
28 |
> case "${KERNEL:-linux}" in |
29 |
|
30 |
mgorny commented to use local instead: |
31 |
|
32 |
local -x CC=$(tc-getCC) |
33 |
... |
34 |
|
35 |
If no other comments, I'll apply this and commit patches somewhere around next |
36 |
weekend. Would be nice if someone using some exotic prefix tried this (should |
37 |
work though, we feed various cross-compilers to cmake via env this way at |
38 |
work). |
39 |
|
40 |
-- |
41 |
regards |
42 |
MM |