[incubator-nuttx] branch releases/9.0 updated: tools/incdir.sh: Correct error in select of include path

[gn...@apache.org]

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

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


The following commit(s) were added to refs/heads/releases/9.0 by this push:
     new 3eaba41  tools/incdir.sh:  Correct error in select of include path
3eaba41 is described below

commit 3eaba41ab9212340ff9376f0c00da190db3f0dea
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Mon Apr 27 07:46:12 2020 -0600

    tools/incdir.sh:  Correct error in select of include path
    
    Commit 3b9efc95a2e introduced an error in the generation of include file paths.  The logic that determined if cygpath should be called to create a Windows native path for the case of Cygwin using a native toolchain was incorrect.  This corrects this warning:
    
     ./tools/configure.sh -c sim:nsh
    $ make
    <CUT>
    make[1]: Entering directory '/home/btashton/apache/apps'
    make[2]: Entering directory '/home/btashton/apache/apps/builtin'
    ./exec_builtin.c:54:10: fatal error: builtin/builtin.h: No such file or directory
       54 | #include "builtin/builtin.h"
          |          ^~~~~~~~~~~~~~~~~~~
    compilation terminated.
    ERROR: cc failed: 1
           command: cc -MT ./exec_builtin.home.btashton.apache.apps.builtin.o  -M -Wall -Wstrict-prototypes -Wshadow -Wundef -g -fno-builtin -fno-common -I. -isystem /home/btashton/apache/nuttx/include -D__KERNEL__ -pipe -I C:\cygwin64\home\btashton\apache\apps\include ./exec_builtin.c
    make[2]: *** [/home/btashton/apache/apps/Application.mk:224: .depend] Error 1
    make[2]: Leaving directory '/home/btashton/apache/apps/builtin'
    make[1]: *** [Makefile:67: /home/btashton/apache/apps/builtin_depend] Error 2
    
    In this case a Cygwin POSIX toolchain is being used by the path in the CFLAGS to apps/include is incorrectly a Windows native path.  This error is corrected by this change to tools/incdir.sh
---
 tools/incdir.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/incdir.sh b/tools/incdir.sh
index 0b5e285..b6c8cc6 100755
--- a/tools/incdir.sh
+++ b/tools/incdir.sh
@@ -200,8 +200,10 @@ for dir in $dirlist; do
   fi
 
   # Check if the path needs to be extended for Windows-based tools under Cygwin
+  # windows=yes:  We are building for a windows platform
+  # wintool=y:    The platform is Cygwin and we are using a windows native tool
 
-  if [ "X$windows" = "Xyes" ]; then
+  if [ "X$windows" = "Xyes" -a "X$wintool" == "Xy" ]; then
     path=`cygpath -w $dir`
   else
     path=$dir