[coreboot-gerrit] Patch set updated for coreboot: seabios integration: fix interaction with ccache

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11138

-gerrit

commit 0a3fb2e8707e78dafcf3de2541a7958841e8e83d
Author: Patrick Georgi <patrick at georgi-clan.de>
Date:   Sat Aug 8 21:35:38 2015 +0200

    seabios integration: fix interaction with ccache
    
    SeaBIOS' build system doesn't like CC to be a compound command like
    "ccache gcc", so we strip things. Unfortunately with CCACHE enabled,
    we passed /usr/bin/ccache (or wherever it was found on the PATH).
    Instead use the second term in CCACHE mode.
    
    Change-Id: I905fcdc73d067e553e923e307fafceaacdefdc6c
    Signed-off-by: Patrick Georgi <patrick at georgi-clan.de>
---
 payloads/external/Makefile.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 165670d..ad1a3ef 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -32,10 +32,11 @@ ifeq ($(CONFIG_PAYLOAD_GRUB2),y)
 COREBOOT_ROM_DEPENDENCIES+=grub2
 endif
 
+SEABIOS_CC_OFFSET=$(if $(filter %ccache,$(HOSTCC)),2,1)
 seabios:
 	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
 			HOSTCC="$(HOSTCC)" \
-			CC=$(word 1,$(CC_x86_32)) CFLAGS="$(patsubst $(word 1,$(CC_x86_32))%,,$(CC_x86_32))" \
+			CC=$(word $(SEABIOS_CC_OFFSET),$(CC_x86_32)) CFLAGS="$(patsubst $(word $(SEABIOS_CC_OFFSET),$(CC_x86_32))%,,$(CC_x86_32))" \
 			LD=$(word 1,$(LD_x86_32)) LDFLAGS="$(patsubst $(word 1,$(LD_x86_32))%,,$(LD_x86_32))" \
 			OBJDUMP="$(OBJDUMP_x86_32)" \
 			OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \