From: Michał Górny Date: Sun, 27 Nov 2016 13:28:55 +0000 (+0100) Subject: cmake-utils.eclass: Wipe out default flags for std build types X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92700a0e7bce7aeadaf65fb778cec49e5ebc594d;p=gentoo.git cmake-utils.eclass: Wipe out default flags for std build types Wipe out the default compiler & linker flags that are forced by CMake for the standard build types. This improves the sanity of the build if we are forced to use one of those types. --- diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index fbd60c24ab27..b21435b1782d 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -599,6 +599,19 @@ enable_cmake-utils_src_configure() { _EOF_ [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]] && echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" + # Wipe the default optimization flags out of CMake + if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]] && ! has "${EAPI}" 2 3 4 5; then + cat >> ${common_config} <<- _EOF_ || die + 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 "") + SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + _EOF_ + fi + # Convert mycmakeargs to an array, for backwards compatibility # Make the array a local variable since <=portage-2.1.6.x does not # support global arrays (see bug #297255).