canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trees: just do makeargs on coreboot, not cbmakearg 

stick the makeargs in mkhelper

i previously did cbmakeargs because the old revisions
had to define makeargs per-target otherwise. mkhelper
was done specifically to solve that problem.

Signed-off-by: Leah Rowe <leah@libreboot.org>
audit2
Leah Rowe 2024-07-05 18:15:56 +01:00 committed by Leah Rowe
parent 05b59f39d6
commit bfeab80a8d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/data/coreboot/mkhelper.cfg Normal file
View File

@ -0,0 +1 @@
makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"

12
script/trees
View File

@ -9,7 +9,6 @@ set -u -e
. "include/lib.sh" . "include/lib.sh"
. "include/git.sh" . "include/git.sh"
cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \ eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \
project target target_dir targets xtree _f target1 bootstrapargs mkhelper \ project target target_dir targets xtree _f target1 bootstrapargs mkhelper \
autoconfargs listfile autogenargs btype tree rev tree_depend` autoconfargs listfile autogenargs btype tree rev tree_depend`
@ -178,9 +177,9 @@ check_cross_compiler()
[ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang"
# sometimes buildgcc fails for like no reason. try twice. # sometimes buildgcc fails for like no reason. try twice.
make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \
make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \
$err "!mkxgcc $project/$xtree '${_xarch%-*}' '$cbmakeargs'" $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$makeargs'"
done; return 0 done; return 0
} }
@ -191,7 +190,7 @@ check_coreboot_utils()
utilsrcdir="src/coreboot/$1/util/$util" utilsrcdir="src/coreboot/$1/util/$util"
utilmode="" && [ -n "$mode" ] && utilmode="clean" utilmode="" && [ -n "$mode" ] && utilmode="clean"
x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $makeargs
[ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \ [ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \
x_ mkdir -p "$utilelfdir" && \ x_ mkdir -p "$utilelfdir" && \
x_ cp "$utilsrcdir/$util" "elf/$util/$1" x_ cp "$utilsrcdir/$util" "elf/$util/$1"
@ -239,8 +238,7 @@ run_make_command()
check_makefile "$cdir" || return 1 check_makefile "$cdir" || return 1
[ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \
printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version"
&& makeargs="$makeargs $cbmakeargs"
make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode"
[ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper"