From 828578cc5706e495fd88ddf67a4228d9b80a506f Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 15 Sep 2026 09:16:28 +0100 Subject: [PATCH] mk: use correct elddir for coreboot xgcc 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 --- mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mk b/mk index 5ec238b6..4dcb8920 100755 --- a/mk +++ b/mk @@ -436,15 +436,17 @@ check_cross_compiler() [ -n "$xgcctree" ] && \ cbdir="src/coreboot/$xgcctree" + cbelfdir="elf${cbdir#src}" + xfix="${1%-*}" [ "$xfix" = "x86_64" ] && \ 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" 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 export PATH="$xbmkpwd/$cbdir/util/crossgcc/xgcc/bin:$PATH"