move xbmkpath to XBMK_CACHE/

When doing ./mk release, the build system would create
symlinks inside xbmkpath/ relative to the current work tree,
which will differ from what's in PATH.

Since XBMK_CACHE is already set globally, from the main work
tree and the release-build work tree, that means we can know
reliably that PATH is always correct if we put xbmkpath/
inside XBMK_CACHE.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2024-12-30 21:25:55 +00:00
parent b0a2384032
commit 466ada423d
2 changed files with 19 additions and 17 deletions
+4 -3
View File
@@ -216,7 +216,8 @@ check_cross_compiler()
$err "!mkxgcc $project/$xtree '$xfix' '$xgccargs'"
# we only want to mess with hostcc to build xgcc
rm -f xbmkpath/* || $err "Cannot clear xbmkpath/"; :
rm -f "$XBMK_CACHE/xbmkpath/"* || \
$err "Cannot clear xbmkpath/"; :
done; return 0
}
@@ -253,8 +254,8 @@ check_gnu_path()
[ "$gnatfull" = "$gccfull" ] || return 1
(
rm -f xbmkpath/* || $err "Cannot clear xbmkpath/"
x_ cd xbmkpath
rm -f "$XBMK_CACHE/xbmkpath/"* || $err "Cannot clear xbmkpath/"
cd "$XBMK_CACHE/xbmkpath" || $err "Can't cd to xbmkpath/"
for _gnubin in "$_gnudir/$2"*"-$_gnuver"; do
[ -e "$_gnubin" ] || continue; _gnuutil="${_gnubin##*/}"
x_ ln -s "$_gnubin" "${_gnuutil%"-$_gnuver"}"