From f5fa96f9c34d5cd9fc2dd0bbdf955b9fffb85a3d Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Sat, 21 Sep 2019 17:39:30 -0700
Subject: buildgcc: Run aclocal before configure

Ubuntu 19.04 will fail looking for aclocal-1.15 if the scripts
are not regenerated because 19.04 ships with 1.16.
There are not enough eyes to roll when working with GNU autotools.

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I4aa9f520499930ffc984ab0b0144c9c6b2e544a0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35522
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 util/crossgcc/buildgcc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'util/crossgcc')

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 9c10c7d56e..6c378ac7fd 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -893,9 +893,11 @@ build_LLVM() {
 }
 
 build_MAKE() {
+	( cd ../${MAKE_DIR}/ && aclocal && autoconf )
 	CC="$(hostcc host)" CXX="$(hostcxx host)" CFLAGS="$HOSTCFLAGS" \
 	../${MAKE_DIR}/configure --prefix="$TARGETDIR" --disable-nls \
 		|| touch .failed
+	$MAKE -k clean
 	# shellcheck disable=SC2086
 	$MAKE $JOBS || touch .failed
 	$MAKE install DESTDIR=$DESTDIR || touch .failed
-- 
cgit v1.2.3