summaryrefslogtreecommitdiff
path: root/config.mk
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
committerTom Rini <trini@ti.com>2013-11-25 10:42:53 -0500
commit74279d37613cb3081ee1680d67b2aed1f934472a (patch)
tree6528e6a0a08a53856c7d31a7eed28dc4d2ec0d21 /config.mk
parent1a1326d2da9b2904bc90fb2990f829cb1ecef312 (diff)
parented072b96efd7a5de51cef01c3d4bed4db0e391f0 (diff)
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/config.mk b/config.mk
index 206de203cc..d5b09a0095 100644
--- a/config.mk
+++ b/config.mk
@@ -250,11 +250,16 @@ Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
endif
endif
+# Sandbox needs the base flags and includes, so keep them around
+BASE_CPPFLAGS := $(CPPFLAGS)
+
ifneq ($(OBJTREE),$(SRCTREE))
-CPPFLAGS += -I$(OBJTREE)/include
+BASE_INCLUDE_DIRS := $(OBJTREE)/include
endif
-CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
+BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
+
+CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)