diff options
| author | Leah Rowe <leah@libreboot.org> | 2024-07-05 18:15:56 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2024-07-05 18:17:23 +0100 |
| commit | 065453b72e6bcf6814b3244a66985d69658a8e38 (patch) | |
| tree | 991929f6cbe746e17eeba84de27ee277ddb48a25 | |
| parent | 2ab1d994906d7ff54ec8723030ef57a56a2047a4 (diff) | |
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>
| -rw-r--r-- | config/data/coreboot/mkhelper.cfg | 1 | ||||
| -rwxr-xr-x | script/trees | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/config/data/coreboot/mkhelper.cfg b/config/data/coreboot/mkhelper.cfg new file mode 100644 index 00000000..3418d98d --- /dev/null +++ b/config/data/coreboot/mkhelper.cfg @@ -0,0 +1 @@ +makeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" diff --git a/script/trees b/script/trees index 4ab0d406..cf344d9d 100755 --- a/script/trees +++ b/script/trees @@ -9,7 +9,6 @@ set -u -e . "include/lib.sh" . "include/git.sh" -cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" eval `setvars "" xarch cdir defconfig cmakedir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f target1 bootstrapargs mkhelper \ autoconfargs listfile autogenargs btype tree rev tree_depend` @@ -180,9 +179,9 @@ check_cross_compiler() [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" # sometimes buildgcc fails for like no reason. try twice. - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - make -C "$cbdir" crossgcc-${_xarch%-*} $cbmakeargs || \ - $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$cbmakeargs'" + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ + $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$makeargs'" done; return 0 } @@ -193,7 +192,7 @@ check_coreboot_utils() utilsrcdir="src/coreboot/$1/util/$util" 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" ] && \ x_ mkdir -p "$utilelfdir" && \ x_ cp "$utilsrcdir/$util" "elf/$util/$1" @@ -241,8 +240,7 @@ run_make_command() check_makefile "$cdir" || return 1 [ "$project" = "coreboot" ] && [ -z "$mode" ] && x_ \ - printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \ - && makeargs="$makeargs $cbmakeargs" + printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode" [ -z "$mkhelper" ] || [ -n "$mode" ] || $mkhelper || $err "!$mkhelper" |