summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2018-06-13 22:30:10 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-06-21 15:47:44 +0000
commit4dfb5f1055b03d27a509272e1a68de45c3fa2266 (patch)
treec2d8657a81f3fdd5bda08ee5cd16b727a85c244e /util
parent35282a0f1b059a42a5a2abef03b559a719cd230f (diff)
downloadcoreboot-4dfb5f1055b03d27a509272e1a68de45c3fa2266.tar.xz
util/abuild: Fix building when not in coreboot root dir
Change-Id: Ibe54096f275a05bda745ae2cc76c0109281c0c4b Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/27095 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'util')
-rwxr-xr-xutil/abuild/abuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 50ac8c79d7..cebb7b735f 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -355,7 +355,7 @@ function compile_target
eval $BUILDPREFIX $MAKE "$verboseopt" DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" BUILD_TIMELESS=$TIMELESS \
&> "${build_dir}/make.log" ; \
MAKE_FAILED=$?
- cp .xcompile "${build_dir}/xcompile.build"
+ cp ${ROOT}/.xcompile "${build_dir}/xcompile.build"
cd "${build_dir}" || return $?
etime=$(perl -e 'print time();' 2>/dev/null || date +%s)
@@ -455,7 +455,7 @@ function build_config
required_arches=$(egrep "^CONFIG_ARCH_(BOOTBLOCK|R.MSTAGE|VERSTAGE)" "$TARGET/${BUILD_NAME}/config.build" | \
sed "s,^CONFIG_ARCH_[^_]*_\([^=]*\)=.*$,\1," |sort -u |tr 'A-Z\n\r' 'a-z ')
# shellcheck disable=SC2016,SC2059
- missing_arches=$(printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | make --no-print-directory -f -)
+ missing_arches=$(printf 'include .xcompile\nall: ; @echo $(foreach arch,'"$required_arches"',$(if $(filter $(arch),$(SUBARCH_SUPPORTED)),,$(arch)))' | $MAKE --no-print-directory -f -)
if [ -n "$missing_arches" ]; then
printf "skipping %s because we're missing compilers for (%s)\n" "$BUILD_NAME" "$missing_arches"
return
@@ -648,7 +648,7 @@ while true ; do
-V|--version) shift; myversion; exit 0;;
-h|--help) shift; myversion; myhelp; exit 0;;
-p|--payloads) shift; payloads="$1"; shift;;
- -R|--root) shift; ROOT="$1"; shift;;
+ -R|--root) shift; ROOT="$1"; MAKE="$MAKE -C $1"; shift;;
-c|--cpus) shift
export MAKEFLAGS="-j $1"
cpus=$1