1 |
commit: 14bbe0bedd3043da77268f07352edc4f0a69fc5e |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 2 10:07:01 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 2 10:15:52 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bbe0be |
7 |
|
8 |
cmake-utils.eclass: Revert "Set assembler correctly, #601292" |
9 |
|
10 |
Revert setting ASM=${CC}. It turns out that CMake is not splitting |
11 |
arguments in ASM like in CC, so this effectively broke all multilib |
12 |
builds. |
13 |
|
14 |
eclass/cmake-utils.eclass | 4 +--- |
15 |
1 file changed, 1 insertion(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
18 |
index c3de622..1305ab2 100644 |
19 |
--- a/eclass/cmake-utils.eclass |
20 |
+++ b/eclass/cmake-utils.eclass |
21 |
@@ -517,7 +517,7 @@ enable_cmake-utils_src_configure() { |
22 |
includes="<INCLUDES>" |
23 |
fi |
24 |
cat > "${build_rules}" <<- _EOF_ || die |
25 |
- SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
26 |
+ SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
27 |
SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
28 |
SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
29 |
SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
30 |
@@ -532,8 +532,6 @@ enable_cmake-utils_src_configure() { |
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 |
- # Bug 601292, set the compiler for assembly as well |
35 |
- local -x ASM=$(tc-getCC) ASMFLAGS=${CFLAGS} |
36 |
|
37 |
if tc-is-cross-compiler; then |
38 |
local sysname |