From a851bbb40a36d4722b51c8232d2307bf0b2e9c5d Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stefan.reinauer@coreboot.org>
Date: Fri, 29 Jan 2016 18:03:26 -0800
Subject: [PATCH] buildgcc: Add GNU make to reference toolchain

Change-Id: I8a41065880c3fd1f95ee8877031bf1738aaae859
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: https://review.coreboot.org/13519
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
---
 util/crossgcc/buildgcc | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 590c15a31a..8f67949f25 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -44,6 +44,7 @@ PYTHON_VERSION=3.4.3
 EXPAT_VERSION=2.1.0
 # CLANG version number
 CLANG_VERSION=3.7.1
+MAKE_VERSION=4.1
 
 # GCC toolchain archive locations
 GMP_ARCHIVE="http://ftpmirror.gnu.org/gmp/gmp-${GMP_VERSION}.tar.bz2"
@@ -61,6 +62,7 @@ LLVM_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/llvm-${CLANG_VERSION}.sr
 CFE_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/cfe-${CLANG_VERSION}.src.tar.xz"
 CRT_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz"
 CTE_ARCHIVE="http://llvm.org/releases/${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz"
+MAKE_ARCHIVE="http://ftpmirror.gnu.org/make/make-${MAKE_VERSION}.tar.bz2"
 
 # GCC toolchain directories
 GMP_DIR="gmp-${GMP_VERSION}"
@@ -78,6 +80,7 @@ LLVM_DIR="llvm-${CLANG_VERSION}.src"
 CFE_DIR="cfe-${CLANG_VERSION}.src"
 CRT_DIR="compiler-rt-${CLANG_VERSION}.src"
 CTE_DIR="clang-tools-extra-${CLANG_VERSION}.src"
+MAKE_DIR="make-${MAKE_VERSION}"
 
 unset MAKELEVEL MAKEFLAGS
 
@@ -520,6 +523,15 @@ build_LLVM() {
 	done
 }
 
+build_MAKE() {
+	CC="$CC" CFLAGS="$HOSTCFLAGS" ../${MAKE_DIR}/configure --prefix=$TARGETDIR \
+		--disable-nls || touch .failed
+	$MAKE $JOBS || touch .failed
+	$MAKE install DESTDIR=$DESTDIR || touch .failed
+
+	normalize_dirs
+}
+
 print_stable() {
 	case "$PRINTSTABLE" in
 		AUTOCONF|autoconf)  printf "%s\n" "$GCC_AUTOCONF_VERSION";;
@@ -534,6 +546,7 @@ print_stable() {
 		MPC|mpc)  printf "%s\n" "$MPC_VERSION";;
 		MPFR|mpfr)  printf "%s\n" "$MPFR_VERSION";;
 		PYTHON|python)  printf "%s\n" "$PYTHON_VERSION";;
+		MAKE|make)  printf "%s\n" "$MAKE_VERSION";;
 		*) printf "Unknown tool %s\n" "$PRINTSTABLE";;
 	esac
 }
@@ -626,8 +639,12 @@ case "$PACKAGE" in
 		NAME="IASL ACPI compiler"
 		PACKAGES=IASL
 		;;
+	MAKE|make)
+		NAME="GNU Make"
+		PACKAGES=MAKE
+		;;
 	*)
-		printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL)${NC}\n\n";
+		printf "${red}ERROR: Unsupported package $PACKAGE. (Supported packages are GCC, GDB, CLANG, IASL, MAKE)${NC}\n\n";
 		exit 1
 		;;
 esac