From b3a18acb569f439dff565092d48d6517525490f6 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick@georgi-clan.de>
Date: Thu, 13 Sep 2012 22:13:33 +0200
Subject: [PATCH] Isolate Kconfig host compiler options

This reverts commit 645f2dd5d97ffbaa80da7fbd776a08a76eb758e3.

Instead of adding a special case to nvramtool to avoid it
picking up Kconfig's regex.h, have the host compiler only
consider util/kconfig for includes (ie. -Iutil/kconfig)
for kconfig related object files.

Change-Id: Ie4f97ce38cb3e911f6e6c1e5b6f86f6998d93f69
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/1509
Tested-by: build bot (Jenkins)
Reviewed-by: Zheng Bao <zheng.bao@amd.com>
Reviewed-by: Anton Kochkov <anton.kochkov@gmail.com>
---
 Makefile                    | 4 ++--
 util/kconfig/Makefile       | 2 ++
 util/nvramtool/Makefile.inc | 4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2723efbbeb..44fd62f148 100644
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@ endif
 
 HOSTCC = gcc
 HOSTCXX = g++
-HOSTCFLAGS := -I$(srck) -I$(objk) -g
-HOSTCXXFLAGS := -I$(srck) -I$(objk)
+HOSTCFLAGS := -g
+HOSTCXXFLAGS := -g
 LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name)
 
 DOXYGEN := doxygen
diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile
index 6cdc845913..75c4ff7a32 100644
--- a/util/kconfig/Makefile
+++ b/util/kconfig/Makefile
@@ -344,3 +344,5 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \
 $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
 	$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@
 
+$(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk)
+$(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index 080734c793..0acda04340 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -27,10 +27,6 @@ endif
 ifeq ($(OS_ARCH), NetBSD)
 NVRAMTOOLLDLFLAGS = -l$(shell uname -p)
 endif
-ifeq ($(OS_ARCH), FreeBSD)
-NVRAMTOOLFLAGS += -O2 -g -Wall -W
-HOSTCFLAGS =
-endif
 ifeq ($(shell uname -o), Cygwin)
 NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__
 NVRAMTOOLLDFLAGS = -lioperm