Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT
Date: Sun, 25 Feb 2018 09:07:08
Message-Id: 20180225090652.26182-1-mgorny@gentoo.org
1 Some CMake projects use ASM-ATT rather than ASM, so extend our rule
2 overrides to that.
3
4 Bug: https://bugs.gentoo.org/625844
5 ---
6 eclass/cmake-utils.eclass | 3 +++
7 1 file changed, 3 insertions(+)
8
9 diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
10 index b9f69a824b14..ef3f3c2607f8 100644
11 --- a/eclass/cmake-utils.eclass
12 +++ b/eclass/cmake-utils.eclass
13 @@ -516,6 +516,7 @@ cmake-utils_src_configure() {
14 fi
15 cat > "${build_rules}" <<- _EOF_ || die
16 SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
17 + SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
18 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
19 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
20 SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
21 @@ -531,6 +532,7 @@ cmake-utils_src_configure() {
22 local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
23 cat > ${toolchain_file} <<- _EOF_ || die
24 SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
25 + SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
26 SET (CMAKE_C_COMPILER "${myCC/ /;}")
27 SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
28 SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
29 @@ -609,6 +611,7 @@ cmake-utils_src_configure() {
30 if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
31 cat >> ${common_config} <<- _EOF_ || die
32 SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
33 + SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
34 SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
35 SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
36 SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
37 --
38 2.16.2

Replies