diff options
Diffstat (limited to 'script/trees')
| -rwxr-xr-x | script/trees | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/script/trees b/script/trees index d3ac03f9..ce6da422 100755 --- a/script/trees +++ b/script/trees @@ -165,11 +165,11 @@ build_dependencies() check_project_hashes() { - x_ mkdir -p cache/hash + mkdir -p "$XBMK_CACHE/hash" || $err "!mkdir '$XBMK_CACHE/hash'" old_pjhash="" - [ ! -f "cache/hash/$project$tree" ] || \ - read -r old_pjhash < "cache/hash/$project$tree" + [ ! -f "$XBMK_CACHE/hash/$project$tree" ] || \ + read -r old_pjhash < "$XBMK_CACHE/hash/$project$tree" x_ rm -f "$TMPDIR/project.list" "$TMPDIR/project.hash" \ "$TMPDIR/project.tmp"; x_ touch "$TMPDIR/project.tmp" @@ -192,10 +192,10 @@ check_project_hashes() pjhash="$(sha512sum "$TMPDIR/project.hash" | awk '{print $1}')" || : badhash="y" && [ "$pjhash" = "$old_pjhash" ] && badhash="n" - [ -f "cache/hash/$project$tree" ] || badhash="y" + [ -f "$XBMK_CACHE/hash/$project$tree" ] || badhash="y" - printf "%s\n" "$pjhash" > "cache/hash/$project$tree" || \ - $err "!mk cache/hash/$project$tree" + printf "%s\n" "$pjhash" > "$XBMK_CACHE/hash/$project$tree" || \ + $err "!mk $XBMK_CACHE/hash/$project$tree" [ "$badhash" = "n" ] || rm -Rf "src/$project/$tree" \ "elf/$project/$tree" "elf/$project/$target" || \ @@ -204,6 +204,7 @@ check_project_hashes() check_cross_compiler() { + xgccargs="UPDATED_SUBMODULES=1 CPUS=$XBMK_THREADS" for _xarch in $xarch; do cbdir="src/coreboot/$tree" [ "$project" != "coreboot" ] && cbdir="src/coreboot/default" @@ -216,9 +217,9 @@ check_cross_compiler() [ -n "$xlang" ] && export BUILD_LANGUAGES="$xlang" # sometimes buildgcc fails for like no reason. try twice. - make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ - make -C "$cbdir" crossgcc-${_xarch%-*} $makeargs || \ - $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$makeargs'" + make -C "$cbdir" crossgcc-${_xarch%-*} $xgccargs || \ + make -C "$cbdir" crossgcc-${_xarch%-*} $xgccargs || \ + $err "!mkxgcc $project/$xtree '${_xarch%-*}' '$xgccargs'" done; return 0 } |