diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include index 3974fbbc49..7ec89270ca 100644 --- a/boards/native/Makefile.include +++ b/boards/native/Makefile.include @@ -1,7 +1,7 @@ -export NATIVEINCLUDES += -DNATIVE_INCLUDES -export NATIVEINCLUDES += -I$(RIOTBOARD)/native/include/ -export NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ -export NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ +NATIVEINCLUDES += -DNATIVE_INCLUDES +NATIVEINCLUDES += -I$(RIOTBOARD)/native/include/ +NATIVEINCLUDES += -I$(RIOTBASE)/core/include/ +NATIVEINCLUDES += -I$(RIOTBASE)/drivers/include/ ifeq ($(OS),Darwin) DEBUGGER ?= lldb @@ -92,7 +92,7 @@ debug-valgrind-server: export VALGRIND_FLAGS ?= --vgdb=yes --vgdb-error=0 -v \ term-cachegrind: export CACHEGRIND_FLAGS += --tool=cachegrind term-gprof: TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE) all-valgrind: CFLAGS += -DHAVE_VALGRIND_H -all-valgrind: export NATIVEINCLUDES += $(shell pkg-config valgrind --cflags) +all-valgrind: NATIVEINCLUDES += $(shell pkg-config valgrind --cflags) all-gprof: CFLAGS += -pg all-gprof: LINKFLAGS += -pg all-asan: CFLAGS += -fsanitize=address -fno-omit-frame-pointer diff --git a/cpu/native/Makefile.include b/cpu/native/Makefile.include index 4e213560e1..7a8b045b28 100644 --- a/cpu/native/Makefile.include +++ b/cpu/native/Makefile.include @@ -1,8 +1,8 @@ -export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include +NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include # Local include for OSX ifeq ($(BUILDOSXNATIVE),1) - export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra + NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra endif USEMODULE += periph diff --git a/dist/tools/buildsystem_sanity_check/check.sh b/dist/tools/buildsystem_sanity_check/check.sh index 1acfca8810..6bdde8ded9 100755 --- a/dist/tools/buildsystem_sanity_check/check.sh +++ b/dist/tools/buildsystem_sanity_check/check.sh @@ -96,6 +96,7 @@ EXPORTED_VARIABLES_ONLY_IN_VARS=() EXPORTED_VARIABLES_ONLY_IN_VARS+=('APPDEPS') EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_ARCH') EXPORTED_VARIABLES_ONLY_IN_VARS+=('CPU_FAM') +EXPORTED_VARIABLES_ONLY_IN_VARS+=('NATIVEINCLUDES') EXPORTED_VARIABLES_ONLY_IN_VARS+=('UNDEF') EXPORTED_VARIABLES_ONLY_IN_VARS+=('USEMODULE') EXPORTED_VARIABLES_ONLY_IN_VARS+=('TARGET_ARCH') diff --git a/makefiles/vars.inc.mk b/makefiles/vars.inc.mk index d85b566a02..c96c626452 100644 --- a/makefiles/vars.inc.mk +++ b/makefiles/vars.inc.mk @@ -17,6 +17,7 @@ export CPU_FAM # An intermediate identifier between CPU and CPU_MO export MCU # The MCU, set by the board's Makefile.include, or defaulted to the same value as CPU. export INCLUDES # The extra include paths, set by the various Makefile.include files. export CXXINCLUDES # The extra include paths for c++, set by the various Makefile.include files. +export NATIVEINCLUDES # The native include paths, set by the various native Makefile.include files. export USEMODULE # Sys Module dependencies of the application. Set in the application's Makefile. export USEPKG # Pkg dependencies (third party modules) of the application. Set in the application's Makefile.