summaryrefslogtreecommitdiffstats
path: root/config.mk
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-26 16:13:59 +0900
committerTom Rini <trini@ti.com>2014-01-29 16:08:52 -0500
commit3d83efbce9c5c0e4f318afd62960b780216f53f0 (patch)
tree7d4fc2bf161d0c3350c87e33f1e6330a5e54a23b /config.mk
parentf889cc81c1572f4af0be950fd49bb6b67bc580fb (diff)
downloadblackbird-obmc-uboot-3d83efbce9c5c0e4f318afd62960b780216f53f0.tar.gz
blackbird-obmc-uboot-3d83efbce9c5c0e4f318afd62960b780216f53f0.zip
sandbox: Use system headers first for sandbox's os.c in a different way
Commit cbe5cdfcd changed config.mk and arch/sandbox/cpu/Makefile to use -idirafter instead of -I and remove -nostdinc. But * Sandbox-specific code dirties config.mk * os.c is compiled without such compiler flags as: -Wall -Wstrict-prototypes -Wno-format-security -fno-builtin -ffreestanding -fno-stack-protector -fstack-usage -Wno-format-nonliteral This commit use -idirafter and remove the -nostdinc differently and more simply. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'config.mk')
-rw-r--r--config.mk9
1 files changed, 2 insertions, 7 deletions
diff --git a/config.mk b/config.mk
index b824bb3469..60e297ae9c 100644
--- a/config.mk
+++ b/config.mk
@@ -250,16 +250,11 @@ 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))
-BASE_INCLUDE_DIRS := $(OBJTREE)/include
+CPPFLAGS += -I$(OBJTREE)/include
endif
-BASE_INCLUDE_DIRS += $(TOPDIR)/include $(SRCTREE)/arch/$(ARCH)/include
-
-CPPFLAGS += $(patsubst %, -I%, $(BASE_INCLUDE_DIRS))
+CPPFLAGS += -I$(TOPDIR)/include -I$(SRCTREE)/arch/$(ARCH)/include
CPPFLAGS += -fno-builtin -ffreestanding -nostdinc \
-isystem $(gccincdir) -pipe $(PLATFORM_CPPFLAGS)
OpenPOWER on IntegriCloud