From b96ced8f4b490172484bdd973a046f2c05770679 Mon Sep 17 00:00:00 2001 From: zouboan Date: Tue, 22 Nov 2022 21:21:14 +0800 Subject: [PATCH] tools/Config:Fix some error caused by double quotation in Windows native build --- tools/Config.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/Config.mk b/tools/Config.mk index d954fded34..2a2438c48b 100644 --- a/tools/Config.mk +++ b/tools/Config.mk @@ -243,8 +243,8 @@ OBJPATH ?= . # CONFIG_WINDOWS_NATIVE - Defined for a Windows native build ifeq ($(CONFIG_WINDOWS_NATIVE),y) - DEFINE ?= "$(TOPDIR)\tools\define.bat" - INCDIR ?= "$(TOPDIR)\tools\incdir.bat" + 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 @@ -589,9 +589,9 @@ $(1)_$(2): endef -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}}) +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__