cmake-utils.eclass: Extend ASM rules to ASM-ATT
authorMichał Górny <mgorny@gentoo.org>
Sun, 25 Feb 2018 09:06:06 +0000 (10:06 +0100)
committerMichał Górny <mgorny@gentoo.org>
Sat, 10 Mar 2018 11:35:13 +0000 (12:35 +0100)
Some CMake projects use ASM-ATT rather than ASM, so extend our rule
overrides to that.

Closes: https://bugs.gentoo.org/625844

eclass/cmake-utils.eclass

index b9f69a824b146c25ae4c17e92a2e0ea365f5482f..ef3f3c2607f8c4e8c9caabab29c9889912048e6e 100644 (file)
@@ -516,6 +516,7 @@ cmake-utils_src_configure() {
        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-ATT_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)
@@ -531,6 +532,7 @@ cmake-utils_src_configure() {
        local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
        cat > ${toolchain_file} <<- _EOF_ || die
                SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+               SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
                SET (CMAKE_C_COMPILER "${myCC/ /;}")
                SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
                SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -609,6 +611,7 @@ cmake-utils_src_configure() {
        if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
                cat >> ${common_config} <<- _EOF_ || die
                        SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+                       SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
                        SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
                        SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
                        SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")