summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-08 11:05:37 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-10 16:13:32 +0200
commitb952f6b68b025bbb9d13deffd3bd621a236537c7 (patch)
tree73893442cc7ccc876eb50a9fdf6b32bccd64a691 /src/arch/x86
parentd777c780660bc8e5b4e531b5335e12bb56d8c700 (diff)
downloadcoreboot-b952f6b68b025bbb9d13deffd3bd621a236537c7.tar.xz
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@chromium.org> Reviewed-on: http://review.coreboot.org/9378 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/Makefile.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index e48913cef5..3b3d26a2f3 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) \