canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mk: Fix bad error handling for gnu_setver 

I mixed logical OR and AND by mistake. Oops!

Signed-off-by: Leah Rowe <leah@libreboot.org>
25.04_branch
Leah Rowe 2025-05-05 11:54:23 +01:00
parent 5f0c7e30ba
commit d87a9b78e0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mk
View File

@ -324,7 +324,8 @@ check_gnu_path()
command -v "$1" 1>/dev/null || err "Host '$1' unavailable" command -v "$1" 1>/dev/null || err "Host '$1' unavailable"
eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`" eval "`setvars "" gccver gccfull gnatver gnatfull gccdir gnatdir`"
x_ gnu_setver "$1" "$1" && gnu_setver "$2" "$2" || : x_ gnu_setver "$1" "$1" || err "Command '$1' unavailable."
gnu_setver "$2" "$2" || :
eval "[ -z \"\$$1ver\" ] && err \"Cannot detect host '$1' version\"" eval "[ -z \"\$$1ver\" ] && err \"Cannot detect host '$1' version\""
[ "$gnatfull" = "$gccfull" ] && return 0 [ "$gnatfull" = "$gccfull" ] && return 0