From 8d6a03820a0dc0470e246b50e4691dd215b760ff Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 25 Apr 2017 17:22:09 +0800 Subject: [PATCH] lwip: fix error when building on OS X, only build ppp if enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - reorder directories listed in COMPONENT_SRCDIRS so that subdirectories precede parent directories - don’t include PPP source directories if PPP support is not enabled --- components/lwip/component.mk | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/components/lwip/component.mk b/components/lwip/component.mk index 0e98b2f51a..6473b021a6 100644 --- a/components/lwip/component.mk +++ b/components/lwip/component.mk @@ -2,9 +2,22 @@ # Component Makefile # -COMPONENT_ADD_INCLUDEDIRS := include/lwip include/lwip/port include/lwip/posix apps/ping +COMPONENT_ADD_INCLUDEDIRS := \ + include/lwip \ + include/lwip/port \ + include/lwip/posix \ + apps/ping -COMPONENT_SRCDIRS := api apps/sntp apps/ping apps core/ipv4 core/ipv6 core netif netif/ppp netif/ppp/polarssl port/freertos port/netif port/debug port +ifdef CONFIG_PPP_SUPPORT +LWIP_PPP_DIRS := netif/ppp/polarssl netif/ppp +endif + +COMPONENT_SRCDIRS := \ + api \ + apps/sntp apps/ping apps \ + core/ipv4 core/ipv6 core \ + $(LWIP_PPP_DIRS) netif \ + port/freertos port/netif port/debug port CFLAGS += -Wno-address # lots of LWIP source files evaluate macros that check address of stack variables