[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] configure: Avoid use of 'local' as it is non-POSIX
From: |
Peter Maydell |
Subject: |
[PATCH 7/7] configure: Avoid use of 'local' as it is non-POSIX |
Date: |
Thu, 25 Aug 2022 16:07:03 +0100 |
We use the non-POSIX 'local' keyword in just two places in configure;
rewrite to avoid it.
In do_compiler(), just drop the 'local' keyword. The variable
'compiler' is only used elsewhere in the do_compiler_werror()
function, which already uses the variable as a normal non-local one.
In probe_target_compiler(), $try and $t are both local; make them
normal variables and use a more obviously distinct variable name
for $t.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
configure | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index f8d7270a60e..f2f793e3653 100755
--- a/configure
+++ b/configure
@@ -110,7 +110,7 @@ error_exit() {
do_compiler() {
# Run the compiler, capturing its output to the log. First argument
# is compiler binary to execute.
- local compiler="$1"
+ compiler="$1"
shift
if test -n "$BASH_VERSION"; then eval '
echo >>config.log "
@@ -2071,7 +2071,6 @@ probe_target_compiler() {
: ${container_cross_strip:=${container_cross_prefix}strip}
done
- local t try
try=cross
case "$target_arch:$cpu" in
aarch64_be:aarch64 | \
@@ -2084,8 +2083,8 @@ probe_target_compiler() {
try='native cross' ;;
esac
eval "target_cflags=\${cross_cc_cflags_$target_arch}"
- for t in $try; do
- case $t in
+ for thistry in $try; do
+ case $thistry in
native)
target_cc=$cc
target_ccas=$ccas
--
2.25.1
- [PATCH 0/7] configure: fix misc shellcheck warnings, Peter Maydell, 2022/08/25
- [PATCH 1/7] configure: Remove unused python_version variable, Peter Maydell, 2022/08/25
- [PATCH 2/7] configure: Remove unused meson_args variable, Peter Maydell, 2022/08/25
- [PATCH 4/7] configure: Add './' on front of glob of */config-devices.mak.d, Peter Maydell, 2022/08/25
- [PATCH 3/7] configure: Add missing quoting for some easy cases, Peter Maydell, 2022/08/25
- [PATCH 6/7] configure: Check mkdir result directly, not via $?, Peter Maydell, 2022/08/25
- [PATCH 7/7] configure: Avoid use of 'local' as it is non-POSIX,
Peter Maydell <=
- [PATCH 5/7] configure: Remove use of backtick `...` syntax, Peter Maydell, 2022/08/25
- Re: [PATCH 0/7] configure: fix misc shellcheck warnings, Marc-André Lureau, 2022/08/26
- Re: [PATCH 0/7] configure: fix misc shellcheck warnings, Philippe Mathieu-Daudé, 2022/08/30