summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-08-11 18:16:59 -0600
committerMartin Roth <martinroth@google.com>2016-08-13 23:31:19 +0200
commit109a7db2bb5b055f4ec936cdb5284427b53fa0a7 (patch)
tree16c18bc90e4c852744f8a6ac2f58d8e72bc2de55
parent34e4a1c01a0082d50a789a3fdf4847dd33d4d114 (diff)
downloadcoreboot-109a7db2bb5b055f4ec936cdb5284427b53fa0a7.tar.gz
coreboot-109a7db2bb5b055f4ec936cdb5284427b53fa0a7.tar.bz2
coreboot-109a7db2bb5b055f4ec936cdb5284427b53fa0a7.zip
crossgcc: Add gnumake target so that make can be built directly
Previously, make could be built as one of the crosgcc* targets, but there was no way to just rebuild make, as there is for IASL. - Add an independent target - gnumake. - Add gnumake to the help text. - Add gnumake to the list of NOCOMPILE targets (Not compiling coreboot) Change-Id: I4df25f2e209ca14944d491dbfb8e9b085ff7aca3 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/16163 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--Makefile2
-rw-r--r--util/crossgcc/Makefile.inc6
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8bd28a7e5d45..54a55b36d74f 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),)
NOCOMPILE:=1
endif
ifneq ($(MAKECMDGOALS),)
-ifneq ($(filter %config %clean cross% clang iasl lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
+ifneq ($(filter %config %clean cross% clang iasl gnumake lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
NOCOMPILE:=1
endif
ifeq ($(MAKECMDGOALS), %clean)
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index d884c7ffa253..cf900bac9f52 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -22,6 +22,7 @@ help_toolchain help::
@echo ' crossgcc-clean - Remove all built coreboot cross-compilers'
@echo ' iasl - Build coreboot IASL compiler (built by all cross targets)'
@echo ' clang - Build coreboot clang compiler'
+ @echo ' gnumake - Build coreboot make'
@echo ' test-toolchain - Reports if toolchain components are out of date'
@echo ' crossgcc-ARCH - Build cross-compiler for specific architecture'
@echo ' crosstools-ARCH - Build cross-compiler with GDB for specific architecture'
@@ -39,7 +40,7 @@ crossgcc: clean-for-update
crossgcc-mips crossgcc-riscv crossgcc-power8 crossgcc-clean iasl \
clang crosstools-i386 crosstools-x64 crosstools-arm \
crosstools-aarch64 crosstools-mips crosstools-riscv crosstools-power8 \
- jenkins-build-toolchain
+ jenkins-build-toolchain gnumake
$(foreach arch,$(TOOLCHAIN_ARCHES),crossgcc-$(arch)): clean-for-update
$(MAKE) -C util/crossgcc $(patsubst crossgcc-%,build-%,$@) build_iasl SKIP_GDB=1
@@ -53,6 +54,9 @@ iasl: clean-for-update
clang: clean-for-update
$(MAKE) -C util/crossgcc build_clang
+gnumake: clean-for-update
+ $(MAKE) -C util/crossgcc build_make
+
$(foreach arch,$(TOOLCHAIN_ARCHES),crosstools-$(arch)): clean-for-update
$(MAKE) -C util/crossgcc $(patsubst crosstools-%,build-%,$@) build_iasl