[incubator-nuttx] branch master updated: boards/Board.mk: Fix MSYS build problem w/ ZDS-II Toolchain

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new f801d04  boards/Board.mk:  Fix MSYS build problem w/ ZDS-II Toolchain
f801d04 is described below

commit f801d049b0dbddb24a38afa351c62703a0426f36
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu May 7 20:43:11 2020 -0600

    boards/Board.mk:  Fix MSYS build problem w/ ZDS-II Toolchain
    
    POSIX style paths must always be converted to Windows style paths when
    using the ZDS-II Toolchain with Cygwin or MSYS
---
 boards/Board.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boards/Board.mk b/boards/Board.mk
index c2e38ac..caa9b96 100644
--- a/boards/Board.mk
+++ b/boards/Board.mk
@@ -76,12 +76,12 @@ ifneq ($(CONFIG_ARCH_FAMILY),)
 endif
 
 ifneq ($(ZDSVERSION),)
-ifeq ($(WINTOOL),y)
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common"
+else
   WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
   WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
   USRINCLUDES = -usrinc:'.;$(WSCHEDSRCDIR);$(WARCHSRCDIR)\chip;$(WARCHSRCDIR)\common'
-else
-  USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR)$(DELIM)chip;$(ARCHSRCDIR)$(DELIM)common"
 endif
 else
 ifeq ($(WINTOOL),y)