Skip to content

Commit

Permalink
configure: Avoid use of param. expansion when using gdb_version
Browse files Browse the repository at this point in the history
$gdb_version is now used in more than one conditional case and its usage
in such cases may increase in the future. Therefore, avoid using shell
parameter expansion when using it by setting gdb_version to its final
form.

Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Message-Id: <20240804161850.2646299-3-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240813202329.1237572-5-alex.bennee@linaro.org>
  • Loading branch information
gromero authored and stsquad committed Aug 16, 2024
1 parent 819039a commit 34a4ef1
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -1103,8 +1103,10 @@ fi
# gdb test

if test -n "$gdb_bin"; then
gdb_version=$($gdb_bin --version | head -n 1)
if version_ge ${gdb_version##* } 9.1; then
gdb_version_string=$($gdb_bin --version | head -n 1)
# Extract last field in the version string
gdb_version=${gdb_version_string##* }
if version_ge $gdb_version 9.1; then
gdb_arches=$($python "$source_path/scripts/probe-gdb-support.py" $gdb_bin)
else
gdb_bin=""
Expand Down Expand Up @@ -1673,7 +1675,7 @@ for target in $target_list; do
echo "GDB=$gdb_bin" >> $config_target_mak
fi

if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge ${gdb_version##* } 15.0; then
if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 15.0; then
echo "GDB_HAS_MTE=y" >> $config_target_mak
fi

Expand Down

0 comments on commit 34a4ef1

Please sign in to comment.