summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2026-09-15 09:16:28 +0100
committerLeah Rowe <leah@libreboot.org>2026-09-15 09:16:28 +0100
commit828578cc5706e495fd88ddf67a4228d9b80a506f (patch)
treeb4e7594b01a23ee2fcbfc512c5dad34b37142d1d
parent7cb4cdf0f23c26d6ce443272bae371c725dd8358 (diff)
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 <leah@libreboot.org>
-rwxr-xr-xmk6
1 files 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"