diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-12-30 21:25:55 +0000 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-12-30 21:25:55 +0000 |
| commit | 466ada423ddabacd6d7c8488b32ca1812f134033 (patch) | |
| tree | c487857092fdc95a6412a9a202f72333bec4e437 /script/trees | |
| parent | b0a23840327f7df97d3b4ea03d0e3f3fe93291c9 (diff) | |
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>
Diffstat (limited to 'script/trees')
| -rwxr-xr-x | script/trees | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/script/trees b/script/trees index 1c38aa48..a3ea1e6f 100755 --- a/script/trees +++ b/script/trees @@ -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"}" |