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

[Sam James]

commit:     55503135684b929613e6d432f4b1d4ee3851961d
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sat Jan 18 17:04:54 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 19:26:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55503135

zig-utils.eclass: add function to get the rightmost flag from CFLAGS

Similar to `get-flag` from toolchain.eclass, but searches from the end,
uses only CFLAGS, and returns value only.

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/zig-utils.eclass | 43 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/eclass/zig-utils.eclass b/eclass/zig-utils.eclass
index 5502d997935e..d92fd0724b17 100644
--- a/eclass/zig-utils.eclass
+++ b/eclass/zig-utils.eclass
@@ -202,6 +202,35 @@ fi
 # 0.13.0
 # @CODE
 
+# @FUNCTION: _get-c-option
+# @INTERNAL
+# @USAGE: <option-name>
+# @DESCRIPTION:
+# Gets value of some compiler option from CFLAGS, starting from the end.
+# Must be a full name, without "-" and "=..." part.
+#
+# Example:
+# @CODE
+# CFLAGS="-march=i686 -march=i586"
+# _get-c-option march # returns i586
+# @CODE
+_get-c-option() {
+       if [[ ${#} -ne 1 ]]; then
+               die "${FUNCNAME[0]}: expected 1 argument, got ${#}"
+       fi
+
+       local prefix="-${1}="
+       local c_flags=( ${CFLAGS} )
+       for (( i=${#c_flags[@]} - 1; i >= 0; i -= 1 )); do
+               local c_flag="${c_flags[i]}"
+               if [[ "${c_flag}" == ${prefix}* ]]; then
+                       echo "${c_flag#${prefix}}"
+                       return
+           fi
+       done
+       echo ""
+}
+
 # @FUNCTION: zig-utils_c_env_to_zig_target
 # @USAGE: <C-style target tuple> <CFLAGS>
 # @DESCRIPTION:
@@ -224,8 +253,8 @@ zig-utils_c_env_to_zig_target() {
        local c_arch="${c_tuple%%-*}"
        local c_abi="${c_tuple##*-}"
 
-       local c_flags="${2}"
-       local c_flags_march="$(CFLAGS="${c_flags}" get-flag march)"
+       local -x CFLAGS="${2}"
+       local c_flags_march="$(_get-c-option march)"
 
        local arch os abi
 
@@ -279,11 +308,11 @@ zig-utils_c_env_to_zig_cpu() {
        local c_tuple="${1}"
        local c_arch="${c_tuple%%-*}"
 
-       local c_flags="${2}"
-       local c_flags_mabi="$(CFLAGS="${c_flags}" get-flag mabi)"
-       local c_flags_march="$(CFLAGS="${c_flags}" get-flag march)"
-       local c_flags_mcpu="$(CFLAGS="${c_flags}" get-flag mcpu)"
-       local c_flags_mfpu="$(CFLAGS="${c_flags}" get-flag mfpu)"
+       local -x CFLAGS="${2}"
+       local c_flags_mabi="$(_get-c-option mabi)"
+       local c_flags_march="$(_get-c-option march)"
+       local c_flags_mcpu="$(_get-c-option mcpu)"
+       local c_flags_mfpu="$(_get-c-option mfpu)"
 
        local base_cpu features=""