GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Isolate Kconfig host compiler options 

This reverts commit 645f2dd5d9.

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>
This commit is contained in:
Patrick Georgi 2012-09-13 22:13:33 +02:00 committed by Anton Kochkov
parent 4adb19bd79
commit b3a18acb56
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -76,8 +76,8 @@ endif
HOSTCC = gcc HOSTCC = gcc
HOSTCXX = g++ HOSTCXX = g++
HOSTCFLAGS := -I$(srck) -I$(objk) -g HOSTCFLAGS := -g
HOSTCXXFLAGS := -I$(srck) -I$(objk) HOSTCXXFLAGS := -g
LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name) LIBGCC_FILE_NAME := $(shell test -r `$(CC) -print-libgcc-file-name` && $(CC) -print-libgcc-file-name)
DOXYGEN := doxygen DOXYGEN := doxygen

2
util/kconfig/Makefile
View File

@ -344,3 +344,5 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \
$(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c
$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@
$(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk)
$(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk)

4
util/nvramtool/Makefile.inc
View File

@ -27,10 +27,6 @@ endif
ifeq ($(OS_ARCH), NetBSD) ifeq ($(OS_ARCH), NetBSD)
NVRAMTOOLLDLFLAGS = -l$(shell uname -p) NVRAMTOOLLDLFLAGS = -l$(shell uname -p)
endif endif
ifeq ($(OS_ARCH), FreeBSD)
NVRAMTOOLFLAGS += -O2 -g -Wall -W
HOSTCFLAGS =
endif
ifeq ($(shell uname -o), Cygwin) ifeq ($(shell uname -o), Cygwin)
NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__ NVRAMTOOLFLAGS += -O2 -g -Wall -W -D__GLIBC__
NVRAMTOOLLDFLAGS = -lioperm NVRAMTOOLLDFLAGS = -lioperm