From e6d3b5763d35b1b45fa897c100385d83535f432c Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 4 May 2025 08:07:06 +0100 Subject: [PATCH] mk: tidy up check_cross_compiler only initialise variables at the point they're needed. Signed-off-by: Leah Rowe --- mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mk b/mk index 12e4393..4bae6df 100755 --- a/mk +++ b/mk @@ -295,7 +295,6 @@ check_project_hashes() check_cross_compiler() { remkdir "$XBMK_CACHE/gnupath" - xgccargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" cbdir="src/coreboot/$tree" [ "$project" != "coreboot" ] && cbdir="src/coreboot/default" @@ -307,12 +306,11 @@ check_cross_compiler() export CROSS_COMPILE="${xarch% *}-" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" - xfix="${1%-*}" && [ "$xfix" = "x86_64" ] && xfix="x64" - # match gnat-X to gcc check_gnu_path gcc gnat || x_ check_gnu_path gnat gcc - # sometimes buildgcc fails for like no reason. try twice. + xfix="${1%-*}" && [ "$xfix" = "x86_64" ] && xfix="x64" + xgccargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" make -C "$cbdir" crossgcc-$xfix $xgccargs || \ x_ make -C "$cbdir" crossgcc-$xfix $xgccargs