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

[Andreas Sturmlechner]

commit:     9bac38649bac48278e4e4af90e3f89f78d861ed2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 17:40:28 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 16:39:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bac3864

cmake.eclass: Fix MYCMAKEARGS support with >=dev-util/cmake-3.23

Closes: https://bugs.gentoo.org/833100
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 02683634af9f..f34ebef1b764 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -593,9 +593,12 @@ cmake_src_configure() {
                "${mycmakeargs_local[@]}"
                -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
                -DCMAKE_TOOLCHAIN_FILE="${toolchain_file}"
-               "${MYCMAKEARGS}"
        )
 
+       if [[ -n ${MYCMAKEARGS} ]] ; then
+               cmakeargs+=( "${MYCMAKEARGS}" )
+       fi
+
        if [[ -n "${CMAKE_EXTRA_CACHE_FILE}" ]] ; then
                cmakeargs+=( -C "${CMAKE_EXTRA_CACHE_FILE}" )
        fi