From 175610de486d514dff12f521726ae587d56faeee Mon Sep 17 00:00:00 2001 From: Jeff Date: Thu, 6 Jul 2017 14:27:16 -0600 Subject: [PATCH] Windows build fixes: Backslash as a delimiter causes problems in pattern subsitutions --- platform/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/platform/Makefile b/platform/Makefile index 8f562f779..dc22f3218 100644 --- a/platform/Makefile +++ b/platform/Makefile @@ -37,7 +37,10 @@ -include $(TOPDIR)/Make.defs CONFIG_ARCH_BOARD ?= dummy -DELIM ?= $(strip /) + +# REVISIT: Backslash causes problems in $(COBJS) target +# DELIM ?= $(strip /) +DELIM := $(strip /) include $(APPDIR)$(DELIM)Make.defs @@ -46,11 +49,11 @@ include $(APPDIR)$(DELIM)Make.defs ifeq ($(DIRLINK),) ifeq ($(CONFIG_WINDOWS_NATIVE),y) -DIRLINK = $(TOPDIR)/tools/link.bat -DIRUNLINK = $(TOPDIR)/tools/unlink.bat +DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.bat +DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.bat else -DIRLINK = $(TOPDIR)/tools/link.sh -DIRUNLINK = $(TOPDIR)/tools/unlink.sh +DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh +DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh endif endif