coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-21 10:12:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

tree.sh: tidy up check_cross_compiler

Browse Source 
group related operations together, without whitespace.

declare all variables at the start of the function.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-08-23 17:38:29 +01:00
parent 07562e3f28
commit 89238c0579
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tree.sh
+3 -8
View File
@@ -224,29 +224,24 @@ check_cross_compiler()
cbdir="src/coreboot/$tree" cbdir="src/coreboot/$tree"
xfix="${1%-*}" && [ "$xfix" = "x86_64" ] && xfix="x64" xfix="${1%-*}" && [ "$xfix" = "x86_64" ] && xfix="x64"
xgccfile="elf/coreboot/$tree/xgcc_${xfix}_was_compiled" xgccfile="elf/coreboot/$tree/xgcc_${xfix}_was_compiled"
x_ mkdir -p "elf/coreboot/$tree" xgccargs="crossgcc-$xfix UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
[ "$project" != "coreboot" ] && cbdir="src/coreboot/default" [ "$project" != "coreboot" ] && cbdir="src/coreboot/default"
[ -n "$xtree" ] && cbdir="src/coreboot/$xtree" [ -n "$xtree" ] && cbdir="src/coreboot/$xtree"
x_ ./mk -f coreboot "${cbdir#src/coreboot/}" x_ ./mk -f coreboot "${cbdir#src/coreboot/}"
x_ mkdir -p "elf/coreboot/$tree"
export PATH="$xbmkpwd/$cbdir/util/crossgcc/xgcc/bin:$PATH" export PATH="$xbmkpwd/$cbdir/util/crossgcc/xgcc/bin:$PATH"
export CROSS_COMPILE="${xarch% *}-" export CROSS_COMPILE="${xarch% *}-"
[ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang"
[ -f "$xgccfile" ] && return 0 # skip build if already done [ -f "$xgccfile" ] && return 0 # skip build if already done
# match gnat-X to gcc
check_gnu_path gcc gnat || x_ check_gnu_path gnat gcc check_gnu_path gcc gnat || x_ check_gnu_path gnat gcc
xgccargs="crossgcc-$xfix UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
make -C "$cbdir" $xgccargs || x_ make -C "$cbdir" $xgccargs make -C "$cbdir" $xgccargs || x_ make -C "$cbdir" $xgccargs
x_ touch "$xgccfile" x_ touch "$xgccfile"
# we only want to mess with hostcc to build xgcc remkdir "$XBMK_CACHE/gnupath" # reset hostcc
remkdir "$XBMK_CACHE/gnupath"
} }
# fix mismatching gcc/gnat versions on debian trixie/sid. as of december 2024, # fix mismatching gcc/gnat versions on debian trixie/sid. as of december 2024,