diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-12-02 11:07:01 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-12-02 11:15:52 +0100 |
| commit | 14bbe0bedd3043da77268f07352edc4f0a69fc5e (patch) | |
| tree | c03d9b3040b5eba5fcc1c5ef4c6c7c89029a397b /eclass | |
| parent | dev-vcs/mercurial: Removed old. (diff) | |
| download | gentoo-14bbe0bedd3043da77268f07352edc4f0a69fc5e.tar.gz gentoo-14bbe0bedd3043da77268f07352edc4f0a69fc5e.tar.bz2 gentoo-14bbe0bedd3043da77268f07352edc4f0a69fc5e.zip | |
cmake-utils.eclass: Revert "Set assembler correctly, #601292"
Revert setting ASM=${CC}. It turns out that CMake is not splitting
arguments in ASM like in CC, so this effectively broke all multilib
builds.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index c3de62265244..1305ab2940f2 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -517,7 +517,7 @@ enable_cmake-utils_src_configure() { includes="<INCLUDES>" fi cat > "${build_rules}" <<- _EOF_ || die - SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) + SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) @@ -532,8 +532,6 @@ enable_cmake-utils_src_configure() { # 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) - # Bug 601292, set the compiler for assembly as well - local -x ASM=$(tc-getCC) ASMFLAGS=${CFLAGS} if tc-is-cross-compiler; then local sysname |