diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-30 13:18:57 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-30 13:18:57 +0000 |
| commit | 7849a07588654c03a0df4c30cc9b772b7c338f7c (patch) | |
| tree | b61dd3ef7ad6c49709ef6a26c5c2cbad36288c65 | |
| parent | 17168a87dbfe969fdf388530f1bd38be1d7db884 (diff) | |
path.sh: minor cleanup
Signed-off-by: Leah Rowe <leah@libreboot.org>
| -rw-r--r-- | include/path.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/path.sh b/include/path.sh index ee921716..56756bbd 100644 --- a/include/path.sh +++ b/include/path.sh @@ -1,10 +1,7 @@ # SPDX-License-Identifier: MIT # Copyright (c) 2024 Leah Rowe <leah@libreboot.org> -# debian trixie/sid ship with gcc 14 when running "gcc", -# but (as of December 2024) gnat is gnat-13. we must create -# a symlink accordingly. -# however, the user may also have gcc 13+14, but only gnat 13 +# fix mismatching gcc/gnat versions on debian trixie/sid check_gnat_path() { eval `setvars "" gccver gnatver gccdir` @@ -21,18 +18,14 @@ check_gnat_path() [ "$gnatver" = "$gccver" ] && return 0 gccdir="$(dirname "$(command -v gcc)")" - for _gnatbin in "$gccdir/gnat-"*; do [ -f "$_gnatbin" ] || continue [ "${_gnatbin#"$gccdir/gnat-"}" = "$gccver" ] || continue gnatver="${_gnatbin#"$gccdir/gnat-"}" break done - [ "$gnatver" = "$gccver" ] || $err "GCC/GNAT versions do not match." - # we already established that the versions match, but if gnat isn't - # in path, then we assume it's in e.g. /usr/bin/gnat-14 ( x_ cd xbmkpath for _gnatbin in "$gccdir/gnat"*"-$gccver"; do |