From f8d2c65fd980b3c031043c4605b48a383558976b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= Date: Fri, 2 Dec 2011 11:53:13 +0100 Subject: [PATCH] sandbox: fix compiling of cpu/os.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit U-boot itself generally builds with -nostdinc. This is because the bootloader needs to be completely standalone. In the sandbox arch though, we need a little bit of code to glue the u-boot world to the host operating system, and we need to be able to access the host libc's headers in order to do so. Currently, we're using -I/usr/include to workaround the global -nostdinc, but that doesn't work for everyone and for all headers. Instead, let's filter out -nostdinc when building the os.c code. Without this patch, some distros hit errors such as: ---8<--- In file included from /usr/include/fcntl.h:27:0, from os.c:22: /usr/include/features.h:323:26: fatal error: bits/predefs.h: No such file or directory --->8--- Signed-off-by: Andreas Bießmann Signed-off-by: Mike Frysinger --- arch/sandbox/cpu/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/cpu/Makefile b/arch/sandbox/cpu/Makefile index e5e860b715..2ae0f7155c 100644 --- a/arch/sandbox/cpu/Makefile +++ b/arch/sandbox/cpu/Makefile @@ -23,9 +23,6 @@ # MA 02111-1307 USA # -# os.c is build in the system environment, so needs standard includes -CPPFLAGS_arch/sandbox/cpu/os.o += -I/usr/include - include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).o @@ -40,6 +37,10 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) +# os.c is build in the system environment, so needs standard includes +$(obj)os.o: ALL_CFLAGS := $(filter-out -nostdinc,$(ALL_CFLAGS)) +$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,$(CPPFLAGS)) + ######################################################################### # defines $(obj).depend target -- 2.30.2