summaryrefslogtreecommitdiff
path: root/script/trees
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-06-25 00:12:18 +0100
committerLeah Rowe <leah@libreboot.org>2024-06-25 00:12:18 +0100
commit4e48fa808ec123962c0203282742f9ce641a40d3 (patch)
treec964404c63110a8e89fb4d65e7c19c39d3df8e23 /script/trees
parentb4fb2510085dc454ec39fcc55619bd38173776ce (diff)
lib.sh: simplify use of environment variables
don't have a separate variable for them. just export them directly and use them directly. Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/trees')
-rwxr-xr-xscript/trees6
1 files changed, 3 insertions, 3 deletions
diff --git a/script/trees b/script/trees
index 2619892f..7f6f2f25 100755
--- a/script/trees
+++ b/script/trees
@@ -9,7 +9,7 @@ set -u -e
. "include/lib.sh"
. "include/git.sh"
-cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$threads"
+cbmakeargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS"
eval `setvars "" xarch cdir config config_name xlang mode makeargs \
listfile project target target_dir targets tree _f target1 bootstrapargs \
autoconfargs cmakedir elfdir autogenargs xtree`
@@ -185,7 +185,7 @@ check_coreboot_utils()
utilmode=""
[ -z "$mode" ] || utilmode="clean"
- x_ make -C "$utilsrcdir" $utilmode -j$threads $cbmakeargs
+ x_ make -C "$utilsrcdir" $utilmode -j$XBMK_THREADS $cbmakeargs
[ -z "$mode" ] && [ ! -f "$utilelfdir/$util" ] && \
x_ mkdir -p "$utilelfdir" && \
x_ cp "$utilsrcdir/$util" "elf/$util/$1"
@@ -240,7 +240,7 @@ run_make_command()
printf "%s\n" "${version%%-*}" > "$cdir/.coreboot-version" \
&& makeargs="$makeargs $cbmakeargs"
- make -C "$cdir" $mode -j$threads $makeargs || $err "!mk $cdir $mode"
+ make -C "$cdir" $mode -j$XBMK_THREADS $makeargs || $err "$cdir mk$mode"
[ "$project" = "grub" ] && [ -z "$mode" ] && mkpayload_grub