aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2015-02-17 12:21:32 +0100
committerPatrick Georgi <pgeorgi@google.com>2015-02-17 18:48:14 +0100
commit7711c0d5c1170d856c87d9963a790457b55403db (patch)
tree3d82834114579a294fa077c28af897712ce6eda0
parentf3d8b9a6630164b707e89f2c3f2c1129f60447f3 (diff)
downloadcoreboot-7711c0d5c1170d856c87d9963a790457b55403db.tar.gz
coreboot-7711c0d5c1170d856c87d9963a790457b55403db.tar.xz
coreboot-7711c0d5c1170d856c87d9963a790457b55403db.zip
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 <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/8478 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Marc Jones <marc.jones@se-eng.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 3386be9bb..8b5d61bb4 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 0c6aafa4d..69f678676 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