diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2018-02-25 10:06:06 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2018-03-10 12:35:13 +0100 |
| commit | a247887d826ce2786dcfd2a380a227b188d4964b (patch) | |
| tree | fff4b220a053007eae3c798a236f717674dc4658 /eclass/cmake-utils.eclass | |
| parent | sys-kernel/vanilla-sources: Automated version bump to {4.14.25,4.15.8} - remo... (diff) | |
| download | gentoo-a247887d826ce2786dcfd2a380a227b188d4964b.tar.gz gentoo-a247887d826ce2786dcfd2a380a227b188d4964b.tar.bz2 gentoo-a247887d826ce2786dcfd2a380a227b188d4964b.zip | |
cmake-utils.eclass: Extend ASM rules to ASM-ATT
Some CMake projects use ASM-ATT rather than ASM, so extend our rule
overrides to that.
Closes: https://bugs.gentoo.org/625844
Diffstat (limited to 'eclass/cmake-utils.eclass')
| -rw-r--r-- | eclass/cmake-utils.eclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index b9f69a824b14..ef3f3c2607f8 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -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 "") |