[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     ed24aa4f0f0d24178cc6c08f36c8550a11ff3e7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 10:57:56 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 08:00:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed24aa4f

cmake-utils.eclass: Set assembly compiler & flags directly

Set the assembly compiler and flags directly instead of implicitly
forcing them in the build rule.

 eclass/cmake-utils.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index c53666e..1fddae1 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_C_COMPILER> <DEFINES> 
${includes} ${CFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM 
compile command" FORCE)
+               SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> 
${includes} ${CPPFLAGS} <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,6 +532,7 @@ enable_cmake-utils_src_configure() {
        # space separated.
        local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
        cat > ${toolchain_file} <<- _EOF_ || die
+               SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
                SET (CMAKE_C_COMPILER "${myCC/ /;}")
                SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
                SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -539,6 +540,8 @@ enable_cmake-utils_src_configure() {
                SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH 
"Archive index generator" FORCE)
        _EOF_
 
+       # We are using the C compiler for assembly by default.
+       local -x ASMFLAGS=${CFLAGS}
        local -x PKG_CONFIG=$(tc-getPKG_CONFIG)
 
        if tc-is-cross-compiler; then