Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-01 20:28:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Makefile: move INCDIROPT to common place (#625)"

Browse source 
This reverts commit b9ace36fcc.

This change was added by PR 625 but has a serious logic flaw.  It removes all occurrences of INCDIROPT and replaces it with a definition in tools/Config.mk:

    else ifeq ($(WINTOOL),y)
      DEFINE = "$(TOPDIR)/tools/define.sh"
      INCDIR = "$(TOPDIR)/tools/incdir.sh" -w

This logic flaw is the Config.mk is included in all Make.defs files BEFORE WINTOOL is defined.  As a result, the definition is wrong in many places when building under Cygwin with a Windows native toolchain.
This commit is contained in:
Gregory Nutt 2020-03-26 08:51:07 -06:00 • committed by Brennan Ashton
parent b9ace36fcc
commit 5c0e8e88b1
57 changed files with 89 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pass1/Makefile
View file

@ -36,6 +36,10 @@
-include $(TOPDIR)/Make.defs
DELIM ?= $(strip /)
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
DEPPATH = --dep-path .
ASRCS = $(wildcard *.S)