From f5891fb69914cf3fbb33ead92e8709684d7fbdf8 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 17 Apr 2025 17:10:19 +0100 Subject: git.sh: remove link_crossgcc() merge it with git_prep Signed-off-by: Leah Rowe --- include/git.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'include/git.sh') diff --git a/include/git.sh b/include/git.sh index 5efde03f..7b0e9a4e 100644 --- a/include/git.sh +++ b/include/git.sh @@ -61,8 +61,12 @@ git_prep() done < "$mdir/module.list"; : fi - [ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \ - [ "$xtree" != "$tree" ] && link_crossgcc "$_loc" + if [ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \ + [ "$xtree" != "$tree" ]; then ( + x_ cd "$tmpgit/util" && x_ rm -Rf crossgcc + x_ ln -s "../../$xtree/util/crossgcc" crossgcc + ) || $err "$_loc: !xgcc link"; fi + [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \ [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit" @@ -131,14 +135,6 @@ git_am_patches() done; : } -link_crossgcc() -{ - ( - x_ cd "$tmpgit/util" && x_ rm -Rf crossgcc - ln -s "../../$xtree/util/crossgcc" crossgcc || $err "$1: !xgcc link" - ) || $err "$1: !xgcc link"; : -} - # can delete from multi- and single-tree projects. # called from script/trees when downloading sources. nuke() -- cgit v1.2.1