coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-09-19 21:20:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

mk: use correct elddir for coreboot xgcc

Browse Source 
in practise, it was always correct because on projects
that used coreboot xgcc, the tree would always be called
default.

however, this is a bug. the logic uses a correct directory
name for coreboot in src/, but not elf/

this patch makes the two consistent, programattically.

this is therefore a preventative bugfix.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-09-15 09:16:28 +01:00
parent 7cb4cdf0f2
commit 828578cc57
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mk
+4 -2
View File
@@ -436,15 +436,17 @@ check_cross_compiler()
[ -n "$xgcctree" ] && \ [ -n "$xgcctree" ] && \
cbdir="src/coreboot/$xgcctree" cbdir="src/coreboot/$xgcctree"
cbelfdir="elf${cbdir#src}"
xfix="${1%-*}" xfix="${1%-*}"
[ "$xfix" = "x86_64" ] && \ [ "$xfix" = "x86_64" ] && \
xfix="x64" xfix="x64"
xgccfile="elf/coreboot/$tree/xgcc_${xfix}_was_compiled" xgccfile="$cbelfdir/xgcc_${xfix}_was_compiled"
xgccargs="crossgcc-$xfix UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" xgccargs="crossgcc-$xfix UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
x_ ./mk -f coreboot "${cbdir#src/coreboot/}" x_ ./mk -f coreboot "${cbdir#src/coreboot/}"
x_ mkdir -p "elf/coreboot/$tree" # TODO: is this needed? x_ mkdir -p "$cbelfdir"
# tell build systems what cross-compiler to use # tell build systems what cross-compiler to use
export PATH="$xbmkpwd/$cbdir/util/crossgcc/xgcc/bin:$PATH" export PATH="$xbmkpwd/$cbdir/util/crossgcc/xgcc/bin:$PATH"