From 7711c0d5c1170d856c87d9963a790457b55403db Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 17 Feb 2015 12:21:32 +0100 Subject: build system: Allow running make what-jenkins-does without ccache coverity isn't too happy with ccache, and given the current setup it also isn't too useful. Change-Id: I420fdd7350dff29296d7101569cb183afe1f92d6 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/8478 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Marc Jones --- Makefile | 2 +- Makefile.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3386be9bbf..8b5d61bb45 100644 --- a/Makefile +++ b/Makefile @@ -97,7 +97,7 @@ ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE:=1 endif ifneq ($(MAKECMDGOALS),) -ifneq ($(filter %config %clean cross% lint%,$(MAKECMDGOALS)),) +ifneq ($(filter %config %clean cross% lint% what-jenkins-does,$(MAKECMDGOALS)),) NOCOMPILE:=1 endif ifeq ($(MAKECMDGOALS), %clean) diff --git a/Makefile.inc b/Makefile.inc index 0c6aafa4dd..69f6786764 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -630,6 +630,6 @@ $(obj)/coreboot.pre: $(objcbfs)/romstage.elf $(obj)/coreboot.pre1 $(CBFSTOOL) JENKINS_PAYLOAD=none what-jenkins-does: - util/abuild/abuild -B -J -y -c 4 -z -p $(JENKINS_PAYLOAD) - (cd payloads/libpayload; $(MAKE) CONFIG_CCACHE=y V=$(V) Q=$(Q) junit.xml) + util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c 4 -z -p $(JENKINS_PAYLOAD) + (cd payloads/libpayload; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_CCACHE=y) V=$(V) Q=$(Q) junit.xml) $(MAKE) V=$(V) Q=$(Q) -C util/cbmem junit.xml -- cgit v1.2.3