[coreboot-gerrit] New patch to review for coreboot: 01f5003 build system: Fix SeaBIOS integration with multilib compilers

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Wed Apr 8 11:06:18 CEST 2015


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

-gerrit

commit 01f50036abe2bc8d70fa49eba20e5a0ff0085b42
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Wed Apr 8 11:05:37 2015 +0200

    build system: Fix SeaBIOS integration with multilib compilers
    
    SeaBIOS doesn't like CC and LD to contain arguments, so split
    those out.
    
    Change-Id: Id651719d529adfa8602a3e4f6685228330f36432
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 src/arch/x86/Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index e48913c..3b3d26a 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -318,7 +318,9 @@ endif # CONFIG_ARCH_RAMSTAGE_X86_32
 seabios:
 	$(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \
 			HOSTCC="$(HOSTCC)" \
-			CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \
+			CC=$(word 1,$(CC_x86_32)) CFLAGS="$(patsubst $(word 1,$(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)" \
 			AS="$(AS_x86_32)" \
 			CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \



More information about the coreboot-gerrit mailing list