mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2024-12-29 04:50:03 +01:00
Merge pull request #8940 from cladmi/pr/revert_remove_nativeincludes
REVERT native: remove non required NATIVEINCLUDES
This commit is contained in:
commit
d85c294514
@ -3,3 +3,5 @@ MODULE = board
|
||||
DIRS = drivers
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -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
|
||||
CFLAGS += -DNATIVE_INCLUDES
|
||||
export CPU = native
|
||||
|
||||
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-gprof: export TERMPROG = GMON_OUT_PREFIX=gmon.out $(ELFFILE)
|
||||
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-cachegrind: export CFLAGS += -g
|
||||
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 LINKFLAGS += -fsanitize=address -fno-omit-frame-pointer -g
|
||||
|
||||
export INCLUDES += $(NATIVEINCLUDES)
|
||||
|
||||
export CFLAGS += -DDEBUG_ASSERT_VERBOSE
|
||||
|
||||
# workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
|
||||
|
@ -1,3 +1,5 @@
|
||||
MODULE = native-drivers
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -27,3 +27,5 @@ ifneq (,$(filter trace,$(USEMODULE)))
|
||||
endif
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -1,6 +1,8 @@
|
||||
export NATIVEINCLUDES += -I$(RIOTCPU)/native/include -I$(RIOTBASE)/sys/include
|
||||
|
||||
# Local include for OSX
|
||||
ifeq ($(BUILDOSXNATIVE),1)
|
||||
INCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
|
||||
export NATIVEINCLUDES += -I$(RIOTCPU)/native/osx-libc-extra
|
||||
endif
|
||||
|
||||
USEMODULE += periph
|
||||
|
@ -1,3 +1,5 @@
|
||||
MODULE := mtd_native
|
||||
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -1 +1,3 @@
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -1 +1,3 @@
|
||||
include $(RIOTBASE)/Makefile.base
|
||||
|
||||
INCLUDES = $(NATIVEINCLUDES)
|
||||
|
@ -28,12 +28,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef __MACH__
|
||||
typedef size_t socklen_t; /**< socket address length */
|
||||
#else
|
||||
/* Defined for OSX with a different type */
|
||||
typedef __darwin_socklen_t socklen_t; /**< socket address length */
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@ -36,9 +36,6 @@
|
||||
sa_family_t sa_prefix##family
|
||||
|
||||
#define __SOCKADDR_COMMON_SIZE (sizeof (unsigned short int))
|
||||
#ifdef __MACH__
|
||||
#define AF_LINK (18) /* Link layer interface */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
|
Loading…
Reference in New Issue
Block a user