diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-27 15:44:51 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-30 00:21:02 +0000 |
| commit | 01fc65a0a9d5310732b95ce3cd2c96ad01479c25 (patch) | |
| tree | 3599a16960cd9d58f01d08d7689994a4f04c0a7f /script | |
| parent | 424b0c7103b71c50396219352cc5f13a9078a461 (diff) | |
Mitigate Debian Trixie/Sid GCC/GNAT version mismatch
When I tested Debian Trixie, and Debian Sid, I saw that
GCC in PATH pointed to gcc-14, but gnat in path pointed
to GNAT-13, even if you manually install gnat-14.
GNAT 14 was marked experimental, but GCC 14 was marked
for use, in the apt repositories.
So this patch doesn't address the mismatch when doing e.g.
apt-get install gcc gnat
I will address the actual package dependency in a follow-up
patch, on the Debian dependencies config.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script')
| -rwxr-xr-x | script/trees | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/script/trees b/script/trees index 698d2b34..b9fd21eb 100755 --- a/script/trees +++ b/script/trees @@ -8,6 +8,7 @@ set -u -e . "include/lib.sh" . "include/git.sh" +. "include/path.sh" XBMKPATH="$PATH" @@ -205,6 +206,8 @@ check_cross_compiler() xfix="${_xarch%-*}" && [ "$xfix" = "x86_64" ] && xfix="x64" + check_gnat_path + # sometimes buildgcc fails for like no reason. try twice. make -C "$cbdir" crossgcc-$xfix $xgccargs || \ make -C "$cbdir" crossgcc-$xfix $xgccargs || \ |