tools/incdir.sh: Correct error in select of include path #895
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Commit 3b9efc9 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
|
@btashton we should backport this and then proceed with RC1, right? |
Yes, this should be backported. I'll cut the release tonight. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Commit 3b9efc9 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.
Impact
This corrects this warning noted in Issue #886:
In this case a Cygwin POSIX toolchain is being used but 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
Testing
Verified by building the sim:nsh configuration on a Cygwin development platform.