From bcefa2f0a20b3aed0b6a10c1dcbf47d222c2bcdf Mon Sep 17 00:00:00 2001 From: yinshengkai Date: Tue, 8 Nov 2022 11:05:12 +0800 Subject: [PATCH] tools: fix errors when executing indir fix the error message when executing make -C nuttx/tools -f Makefile.host clean /bin/sh: 1: nuttx/tools/../tools/incdir: not found Signed-off-by: yinshengkai --- tools/Config.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/Config.mk b/tools/Config.mk index 2466f1fbde..d954fded34 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -121,6 +121,12 @@ else DELIM ?= $(strip /) endif +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + EMPTYFILE := "NUL" +else + EMPTYFILE := "/dev/null" +endif + # Process chip-specific directories ifeq ($(CONFIG_ARCH_CHIP_CUSTOM),y) @@ -583,9 +589,9 @@ $(1)_$(2): endef -export DEFINE_PREFIX := $(subst X,,${shell $(DEFINE) "$(CC)" "X"}) -export INCDIR_PREFIX := $(subst "X",,${shell $(INCDIR) "$(CC)" "X"}) -export INCSYSDIR_PREFIX := $(subst "X",,${shell $(INCDIR) -s "$(CC)" "X"}) +export DEFINE_PREFIX ?= $(subst X,,${shell $(DEFINE) "$(CC)" "X" 2> ${EMPTYFILE}}) +export INCDIR_PREFIX ?= $(subst "X",,${shell $(INCDIR) "$(CC)" "X" 2> ${EMPTYFILE}}) +export INCSYSDIR_PREFIX ?= $(subst "X",,${shell $(INCDIR) -s "$(CC)" "X" 2> ${EMPTYFILE}}) # ARCHxxx means the predefined setting(either toolchain, arch, or system specific) ARCHDEFINES += ${DEFINE_PREFIX}__NuttX__