riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "native: remove non required NATIVEINCLUDES"

Browse Source 
This reverts commit 93a521c50132e24558e42bc57dcf9c94051f07e3.
This commit is contained in:
Gaëtan Harter 2018-04-12 17:48:07 +02:00
parent 6ee4aceef1
commit 40c28d78c0
8 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/native/Makefile
View File

@ -3,3 +3,5 @@ MODULE = board
DIRS = drivers DIRS = drivers
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

12
boards/native/Makefile.include
View File

@ -1,7 +1,9 @@
export CPU = native export NATIVEINCLUDES += -DNATIVE_INCLUDES
export NATIVEINCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/
export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/
# Configuration for core/include/kernel_types.h export CPU = native
CFLAGS += -DNATIVE_INCLUDES
USEMODULE += native-drivers USEMODULE += native-drivers
@ -113,7 +115,7 @@ debug-valgrind-server: export VALGRIND_FLAGS ?= --vgdb=yes --vgdb-error=0 -v \
term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind
term-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE) term-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE)
all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g all-valgrind: export CFLAGS += -DHAVE_VALGRIND_H -g
all-valgrind: export CFLAGS += $(shell pkg-config valgrind --cflags) all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags)
all-debug: export CFLAGS += -g all-debug: export CFLAGS += -g
all-cachegrind: export CFLAGS += -g all-cachegrind: export CFLAGS += -g
all-gprof: export CFLAGS += -pg all-gprof: export CFLAGS += -pg
@ -122,6 +124,8 @@ all-asan: export CFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
all-asan: export CFLAGS += -DNATIVE_IN_CALLOC all-asan: export CFLAGS += -DNATIVE_IN_CALLOC
all-asan: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g all-asan: export LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
export INCLUDES += $(NATIVEINCLUDES)
export CFLAGS += -DDEBUG_ASSERT_VERBOSE export CFLAGS += -DDEBUG_ASSERT_VERBOSE
# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624 # workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624

2
boards/native/drivers/Makefile
View File

@ -1,3 +1,5 @@
MODULE = native-drivers MODULE = native-drivers
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/Makefile
View File

@ -27,3 +27,5 @@ ifneq (,$(filter trace,$(USEMODULE)))
endif endif
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

4
cpu/native/Makefile.include
View File

@ -1,6 +1,8 @@
export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include
# Local include for OSX # Local include for OSX
ifeq ($(BUILDOSXNATIVE),1) ifeq ($(BUILDOSXNATIVE),1)
INCLUDES += -I$(RIOTCPU)/native/osx-libc-extra export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
endif endif
USEMODULE += periph USEMODULE += periph

2
cpu/native/mtd/Makefile
View File

@ -1,3 +1,5 @@
MODULE := mtd_native MODULE := mtd_native
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/netdev_tap/Makefile
View File

@ -1 +1,3 @@
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)

2
cpu/native/socket_zep/Makefile
View File

@ -1 +1,3 @@
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
INCLUDES = $(NATIVEINCLUDES)