[gentoo-commits] proj/genkernel:master commit in: /

[Thomas Deutschmann]

commit:     b2cd6f1408b75dbef2bf24ffbff1e0f9376c94c3
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 15:08:03 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b2cd6f14

gen_funcs.sh: _tc-getPROG(): Fix overriding of default program

tc-getBUILD_PROG() could pass multiple variables so we need to check
all variables until we find our config variable containing user's value.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gen_funcs.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gen_funcs.sh b/gen_funcs.sh
index 507fadf..6917202 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1167,8 +1167,16 @@ _tc-getPROG() {
                type=KERNEL
        fi
 
-       local prog_default_varname="DEFAULT_${type}_${var}"
-       local prog_override_varname="${type}_${var}"
+       local prog_default_varname=
+       local prog_override_varname=
+       for v in ${vars} ; do
+               prog_default_varname="DEFAULT_${type}_${v}"
+               if [[ -n "${!prog_default_varname}" ]]
+               then
+                       prog_override_varname="${type}_${v}"
+                       break
+               fi
+       done
 
        if [[ -n "${!prog_default_varname}" ]] \
                && [[ "${!prog_override_varname}" != "${!prog_default_varname}" 
]]