patacongo removed a comment on pull request #1152:
URL: https://github.com/apache/incubator-nuttx/pull/1152#issuecomment-636386673
> If we accept the changes to Makefile.win and Makefile.unix but ignor the
bad changes to Config.mk, then all of the errors about failing to find the
incdir binary disappear except four that occur during configuration.
I have backed out the changes to Config.mk. That means that there are still
4 reported errors at configuration time. I am not sure yet how to fix these.
The remaining changes to Makefile.unix and Makefile.win are still good, but
insufficient because you will still see 4 errors about failing to find the
tools/incdir binary.
For the record, this is the change to Config.mk that was backed out:
diff --git a/tools/Config.mk b/tools/Config.mk
index 1e163ce03c..2ba0b3779f 100644
--- a/tools/Config.mk
+++ b/tools/Config.mk
@@ -174,15 +174,18 @@ endif
#
# CONFIG_WINDOWS_NATIVE - Defined for a Windows native build
+INCDIRSH := "$(TOPDIR)/tools/incdir.sh"
+INCDIRBIN := "$(TOPDIR)/tools/incdir$(HOSTEXEEXT)"
+
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
DEFINE ?= "$(TOPDIR)\tools\define.bat"
INCDIR ?= "$(TOPDIR)\tools\incdir.bat"
else ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
DEFINE ?= "$(TOPDIR)/tools/define.sh" -w
- INCDIR ?= "$(TOPDIR)/tools/incdir$(HOSTEXEEXT)" -w
+ INCDIR ?= $(if $(wildcard $(INCDIRBIN)),$(INCDIRBIN) -w,$(INCDIRSH)
-w)
else
DEFINE ?= "$(TOPDIR)/tools/define.sh"
- INCDIR ?= "$(TOPDIR)/tools/incdir$(HOSTEXEEXT)"
+ INCDIR ?= $(if $(wildcard $(INCDIRBIN)),$(INCDIRBIN),$(INCDIRSH))
endif
# PREPROCESS - Default macro to run the C pre-processor
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
