From cd9abf95e7fe3d67f02e5e0197efa2688db83d22 Mon Sep 17 00:00:00 2001
From: Andrew Wu <arw@dmp.com.tw>
Date: Tue, 3 Sep 2013 20:39:48 +0800
Subject: [PATCH] arch/x86/Makefile.inc: Pass $(AS) and $(CPP) to SeaBIOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SeaBIOS’ Makefile requires cpp (C Preprocessor) to build. Modify
the xcompile script to search for cpp program path, and pass it to
SeaBIOS’ `Makefile.inc`. Also pass the program path for as (GNU assembler).

This is needed, so the crossgcc toolchain to build the SeaBIOS payload
under Mac OSX. OSX ships a cpp program, but it works differently
from GNU CPP, so we need to override it.

Change-Id: If996ffbb76ec4bd16079b54b41f3fac07bfe25be
Signed-off-by: Andrew Wu <arw@dmp.com.tw>
Reviewed-on: http://review.coreboot.org/3896
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Jonathan A. Kollasch <jakllsch@kollasch.net>
---
 Makefile                  | 1 +
 src/arch/x86/Makefile.inc | 1 +
 util/xcompile/xcompile    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index dec32e5dc2..b709d14a9d 100644
--- a/Makefile
+++ b/Makefile
@@ -126,6 +126,7 @@ ARCH-$(CONFIG_ARCH_X86)     := i386
 ifneq ($(INNER_SCANBUILD),y)
 CC := $(CC_$(ARCH-y))
 endif
+CPP := $(CPP_$(ARCH-y))
 AS := $(AS_$(ARCH-y))
 LD := $(LD_$(ARCH-y))
 NM := $(NM_$(ARCH-y))
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index b3b82b998c..dee56c5345 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -427,6 +427,7 @@ seabios:
 			HOSTCC="$(HOSTCC)" \
 			CC="$(CC)" LD="$(LD)" OBJDUMP="$(OBJDUMP)" \
 			OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \
+			AS="$(AS)" CPP="$(CPP)" \
 			CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
 			CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
 			OUT=$(abspath $(obj)) IASL="$(IASL)"
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index de6084d8fa..5388889776 100644
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -117,6 +117,7 @@ report_arch_toolchain() {
 	cat <<EOF
 # elf${TWIDTH}-${TBFDARCH} toolchain (${GCCPREFIX}gcc)
 CC_${TARCH}:=${GCCPREFIX}gcc ${CFLAGS}
+CPP_${TARCH}:=${GCCPREFIX}cpp
 AS_${TARCH}:=${GCCPREFIX}as ${ASFLAGS}
 LD_${TARCH}:=${GCCPREFIX}ld${LINKER_SUFFIX} ${LDFLAGS}
 NM_${TARCH}:=${GCCPREFIX}nm