[coreboot-gerrit] New patch to review for coreboot: 7b56cc5 Do not export variables to GRUB build

[Vladimir Serbinenko (phcoder@gmail.com)]

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4310

-gerrit

commit 7b56cc5937a31ea05218b89f13aed14c11a2d53a
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Tue Dec 3 18:22:44 2013 +0100

    Do not export variables to GRUB build
    
    Variables in coreboot and not in line with GRUB ones. E.g. HOSTCC is both
    HOST_CC and BUILD_CC for GRUB (consult INSTALL for more details) and
    what coreboot calls CC is TARGET_CC for GRUB.
    
    Current code plugs this by defining variables explicitly but it has a nasty
    effect that make stops caring about flags added in makefile itself. Undef
    as many variables as possible but still pass them to configure for them to
    have correct effect and keep CC assignment as my make version doesn't undefine
    it even when instructed to do so.
    
    Tested with qemu.
    
    Change-Id: I9d18f557138a20ae3918d698dee8f5b5c5738f75
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 payloads/external/GRUB2/Makefile.inc | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/payloads/external/GRUB2/Makefile.inc b/payloads/external/GRUB2/Makefile.inc
index 888151d..4b08e7d 100644
--- a/payloads/external/GRUB2/Makefile.inc
+++ b/payloads/external/GRUB2/Makefile.inc
@@ -2,6 +2,20 @@ TAG-$(CONFIG_GRUB2_MASTER)=
 NAME-$(CONFIG_GRUB2_MASTER)=HEAD
 
 unexport KCONFIG_AUTOCONFIG
+unexport CFLAGS
+unexport CPPFLAGS
+unexport CCASFLAGS
+unexport CC
+unexport BUILD_CC
+unexport TARGET_CC
+unexport TARGET_CFLAGS
+unexport TARGET_CPPFLAGS
+unexport TARGET_STRIP
+unexport TARGET_OBJCOPY
+unexport HOST_CFLAGS
+unexport HOST_CPPFLAGS
+unexport HOST_CC
+
 
 all: grub2
 
@@ -27,12 +41,8 @@ config: checkout
 
 grub2: config
 	echo "    MAKE       GRUB2 $(NAME-y)"
-	$(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \
-	TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" \
-	TARGET_STRIP="$(STRIP)" CFLAGS=-O2 TARGET_CFLAGS=-Os \
-	&& $(MAKE) -C grub2/build BUILD_CC="$(HOSTCC)" CC="$(HOSTCC)" \
-	TARGET_CC="$(CC)" TARGET_OBJCOPY="$(OBJCOPY)" TARGET_STRIP="$(STRIP)" \
-	CFLAGS=-O2 TARGET_CFLAGS=-Os default_payload.elf
+	$(MAKE) -C grub2/build CC="$(HOSTCC)"
+	$(MAKE) -C grub2/build default_payload.elf
 
 clean:
 	test -d grub2 && $(MAKE) -C grub2 clean || exit 0