git.sh: remove link_crossgcc()

merge it with git_prep

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 6 insertions, 10 deletions

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()