Skip to content

Commit

Permalink
fixup: SQUASH me. FIX by just removing sys/posix/include
Browse files Browse the repository at this point in the history
Includes for sys/posix/includes are the only new includes after removing
NATIVEINCLUDES. And it breaks on mac because of types conflicts.

I prefer replacing the complete specific case by just removing the breaking non
required include directory that is pulled by an other module dependency.
  • Loading branch information
cladmi committed Mar 15, 2018
1 parent 66fdf1e commit f800ce2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 0 deletions.
3 changes: 3 additions & 0 deletions boards/native/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ MODULE = board

DIRS = drivers

# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions boards/native/drivers/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
MODULE = native-drivers

# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions cpu/native/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ ifneq (,$(filter can_linux,$(USEMODULE)))
DIRS += can
endif

# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions cpu/native/mtd/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
MODULE := mtd_native

# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions cpu/native/netdev_tap/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions cpu/native/socket_zep/Makefile
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Use system posix include for native base modules
INCLUDES := $(filter-out -I$(RIOTBASE)/sys/posix/include, $(INCLUDES))

include $(RIOTBASE)/Makefile.base

0 comments on commit f800ce2

Please sign in to comment.