[gentoo-commits] proj/gcc-config:master commit in: /

["Sam James" <sam@gentoo.org>]

commit:     6d83aec7a8d26035d81b1cafdf007135aa4ea094
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 15:45:32 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 14 17:24:32 2023 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-config.git/commit/?id=6d83aec7

gcc-config: Don't call portageq if the variable is already set

Bug: https://bugs.gentoo.org/906329
Acked-by: James Le Cuirot <chewi <AT> gentoo.org>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
Closes: https://github.com/gentoo/gcc-config/pull/3
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gcc-config | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gcc-config b/gcc-config
index 80951b4..404ab29 100755
--- a/gcc-config
+++ b/gcc-config
@@ -42,9 +42,10 @@ fi
 PV="@PV@"
 [[ ${PV} == @*@ ]] && PV="git"
 
-ABI=$(portageq envvar DEFAULT_ABI 2>/dev/null)
-GENTOO_LIBDIR=$(portageq envvar LIBDIR_"${ABI}" 2>/dev/null)
-[[ $? != 0 || -z ${GENTOO_LIBDIR} ]] && GENTOO_LIBDIR="@GENTOO_LIBDIR@"
+ABI=${DEFAULT_ABI:-$(portageq envvar DEFAULT_ABI 2>/dev/null)}
+LIBDIR_VAR=LIBDIR_${ABI}
+GENTOO_LIBDIR=${!LIBDIR_VAR:-$(portageq envvar "${LIBDIR_VAR}" 2>/dev/null)}
+[[ $? -ne 0 || -z ${GENTOO_LIBDIR} ]] && GENTOO_LIBDIR="@GENTOO_LIBDIR@"
 [[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
 
 usage() {
@@ -166,7 +167,7 @@ get_chost() {
 
 	# Make sure Portage isn't broken.
 	CHOST=$(portageq envvar CHOST 2>/dev/null)
-	if [[ $? != 0 || -z ${CHOST} ]] ; then
+	if [[ $? -ne 0 || -z ${CHOST} ]] ; then
 		ewarn "Python or Portage seems to be broken, attempting to locate CHOST ourselves ..."
 		CHOST=$(try_real_hard_to_find_CHOST)
 	fi