[coreboot-gerrit] New patch to review for coreboot: util/crosssgcc: Update makefiles

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17983

-gerrit

commit 1dd01c491caf17dc8a5275b5bfbf85721eef0c05
Author: Martin Roth <martinroth at google.com>
Date:   Wed Dec 28 11:35:27 2016 -0700

    util/crosssgcc: Update makefiles
    
    - Update clean_tempfiles target to remove make and expat
    - jenkins-build-toolchain would fail on test-toolchain if XGCCPATH was
    set in the environment.  Instead of updating the path to include the
    newly built toolchain, update XGCCPATH to point to the new toolchain.
    - Don't check the existing toolchain when trying to build the new
    toolchain.
    
    Change-Id: Ie44c0308cc97f631948f3e13bf505979ac5b17a0
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 Makefile                   | 2 +-
 util/crossgcc/Makefile     | 3 ++-
 util/crossgcc/Makefile.inc | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7801c47..6f94af6 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 gnumake lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
+ifneq ($(filter %config %clean cross% clang iasl gnumake lint% help% jenkins-build-toolchain what-jenkins-does,$(MAKECMDGOALS)),)
 NOCOMPILE:=1
 endif
 ifeq ($(MAKECMDGOALS), %clean)
diff --git a/util/crossgcc/Makefile b/util/crossgcc/Makefile
index 24fe942..41a7c4f 100644
--- a/util/crossgcc/Makefile
+++ b/util/crossgcc/Makefile
@@ -71,10 +71,11 @@ build-nds32le:
 
 clean_tempfiles:
 	rm -rf build-*
-	rm -rf binutils-* gcc-* gmp-* libelf-* mpc-* mpfr-*
+	rm -rf binutils-* gcc-* gmp-* libelf-* mpc-* mpfr-* expat-*
 	rm -rf llvm-* clang-tools-* cfe-* compiler-rt-*
 	rm -rf acpica-*
 	rm -rf gdb-*
+	rm -rf make-*
 	rm -f  getopt
 
 clean: clean_tempfiles
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.inc
index 9b17300..1f5289f 100644
--- a/util/crossgcc/Makefile.inc
+++ b/util/crossgcc/Makefile.inc
@@ -72,10 +72,12 @@ else
 endif # ifeq ($(COMPILER_OUT_OF_DATE),1)
 
 # This target controls what the jenkins builder tests
+jenkins-build-toolchain: XGCCPATH=$(if $(DEST),$(DEST)/bin/,$(top)/util/crossgcc/xgcc/bin/)
 jenkins-build-toolchain: BUILDGCC_OPTIONS ?= -y --nocolor -b
 jenkins-build-toolchain:
+	export XGCCPATH
 	$(MAKE) crosstools clang KEEP_SOURCES=1 BUILDGCC_OPTIONS='$(BUILDGCC_OPTIONS)'
 	rm -f .xcompile
-	PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) what-jenkins-does
+	$(MAKE) what-jenkins-does
 	-cat .xcompile
-	PATH=$(if $(DEST),$(DEST)/bin,$(top)/util/crossgcc/xgcc/bin):$$PATH; $(MAKE) test-toolchain
+	$(MAKE) test-toolchain