From a2c009bd94aa3c9694158f9e28184ccbd94df42b Mon Sep 17 00:00:00 2001 From: Reka Norman Date: Tue, 14 Sep 2021 16:41:47 +1000 Subject: [PATCH] util/abuild: Regenerate xcompile on every abuild run Currently, running abuild in a fresh checkout without having built the toolchain results in the following confusing behaviour: 1. Run abuild. It fails due to the missing coreboot toolchain, and the error message suggests running `make crossgcc`. 2. Run `make crossgcc`. It succeeds. 3. Re-run abuild. It still fails due to a missing coreboot toolchain. This happens because the first abuild run generates an xcompile file which uses the system toolchain. The second abuild run doesn't regenerate the xcompile, so it still fails due to the non-coreboot toolchain. To avoid this confusing behaviour, regenerate the xcompile file every time abuild is run. BUG=None TEST=Perform the steps above in a clean checkout. The second abuild run now succeeds. Signed-off-by: Reka Norman Change-Id: I78a7702c45cecbfe8460ec55df03741e5ced94b3 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57651 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- util/abuild/abuild | 1 + 1 file changed, 1 insertion(+) diff --git a/util/abuild/abuild b/util/abuild/abuild index 5fe298ee6e..306c9abf59 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -788,6 +788,7 @@ fi # Generate a single xcompile for all boards export xcompile="${TARGET}/xcompile" +rm -f "${xcompile}" $MAKE -C"${ROOT}" obj="$TARGET/temp" objutil="$TARGET/sharedutils" UPDATED_SUBMODULES=1 "${xcompile}" || exit 1 customizing=$(echo "$customizing" | cut -c3-)