From bc5d1165aa708f5f0461f18bf1d7620b12640c60 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sun, 20 Feb 2022 18:00:43 +0800
Subject: [PATCH] Replace cygpath with CONVERT_PATH

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 Application.mk   | 18 +++---------------
 Make.defs        |  6 +-----
 Makefile         |  6 +-----
 import/Make.defs | 21 +++------------------
 4 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/Application.mk b/Application.mk
index 1ac09e30a..f83a11ef6 100644
--- a/Application.mk
+++ b/Application.mk
@@ -62,11 +62,7 @@ endif
 # Add the static application library to the linked libraries. Don't do this
 # with CONFIG_BUILD_KERNEL as there is no static app library
 ifneq ($(CONFIG_BUILD_KERNEL),y)
-  ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-    LDLIBS += "${shell cygpath -w $(BIN)}"
-  else
-    LDLIBS += $(BIN)
-  endif
+  LDLIBS += $(call CONVERT_PATH,$(BIN))
 endif
 
 # When building a module, link with the compiler runtime.
@@ -166,11 +162,7 @@ $(RUSTOBJS): %$(RUSTEXT)$(SUFFIX)$(OBJEXT): %$(RUSTEXT)
 		$(call ELFCOMPILERUST, $<, $@), $(call COMPILERUST, $<, $@))
 
 archive:
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-	$(call ARCHIVE_ADD, "${shell cygpath -w $(BIN)}", $(OBJS))
-else
-	$(call ARCHIVE_ADD, $(BIN), $(OBJS))
-endif
+	$(call ARCHIVE_ADD, $(call CONVERT_PATH,$(BIN)), $(OBJS))
 
 ifeq ($(BUILD_MODULE),y)
 
@@ -188,11 +180,7 @@ PROGOBJ := $(MAINCOBJ) $(MAINCXXOBJ) $(MAINRUSTOBJ)
 
 $(PROGLIST): $(MAINCOBJ) $(MAINCXXOBJ) $(MAINRUSTOBJ)
 	$(Q) mkdir -p $(BINDIR)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-	$(call ELFLD,$(firstword $(PROGOBJ)),"${shell cygpath -w $(firstword $(PROGLIST))}")
-else
-	$(call ELFLD,$(firstword $(PROGOBJ)),$(firstword $(PROGLIST)))
-endif
+	$(call ELFLD,$(firstword $(PROGOBJ)),$(call CONVERT_PATH,$(firstword $(PROGLIST))))
 	$(Q) chmod +x $(firstword $(PROGLIST))
 ifneq ($(CONFIG_DEBUG_SYMBOLS),y)
 	$(Q) $(STRIP) $(firstword $(PROGLIST))
diff --git a/Make.defs b/Make.defs
index c1e20052e..0cfa55529 100644
--- a/Make.defs
+++ b/Make.defs
@@ -98,8 +98,4 @@ endef
 CFLAGS   += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
 CXXFLAGS += ${shell $(INCDIR) "$(CC)" "$(APPDIR)$(DELIM)include"}
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  NUTTXLIB ?= "${shell cygpath -w $(TOPDIR)$(DELIM)staging}"
-else
-  NUTTXLIB ?= "$(TOPDIR)$(DELIM)staging"
-endif
+NUTTXLIB ?= $(call CONVERT_PATH,$(TOPDIR)$(DELIM)staging)
diff --git a/Makefile b/Makefile
index a34b0988c..f33a9cffc 100644
--- a/Makefile
+++ b/Makefile
@@ -101,11 +101,7 @@ $(SYMTABOBJ): %$(OBJEXT): %.c
 	$(call COMPILE, -fno-lto $<, $@)
 
 $(BIN): $(SYMTABOBJ)
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-	$(call ARCHIVE_ADD, "${shell cygpath -w $(BIN)}", $^)
-else
-	$(call ARCHIVE_ADD, $(BIN), $^)
-endif
+	$(call ARCHIVE_ADD, $(call CONVERT_PATH,$(BIN)), $^)
 
 endif # !CONFIG_BUILD_LOADABLE
 
diff --git a/import/Make.defs b/import/Make.defs
index 6ecfdc6df..3d100f7ca 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -26,12 +26,7 @@ include $(TOPDIR)/scripts/Make.defs
 # Tool related definitions
 # Compiler
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  ARCHCRT0OBJ = "${shell cygpath -w $(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT)}"
-else
-  ARCHCRT0OBJ = $(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT)
-endif
-
+ARCHCRT0OBJ = $(call CONVERT_PATH,$(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT))
 ARCHINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
 
 ARCHXXINCLUDES += ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
@@ -66,13 +61,7 @@ AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 # Linker
 
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  # Windows-native toolchains
-  LDLIBPATH = -L "${shell cygpath -w $(APPDIR)}" -L "${shell cygpath -w $(TOPDIR)$(DELIM)libs}"
-else
-  # Linux/Cygwin-native toolchain
-  LDLIBPATH = -L $(TOPDIR)$(DELIM)libs
-endif
+LDLIBPATH = $(addprefix -L,$(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs))
 
 # Link with user libraries
 
@@ -99,8 +88,4 @@ endif
 # ELF module definitions
 
 LDELFFLAGS = -r -e _start -Bstatic
-ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
-  LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/scripts/gnu-elf.ld}"
-else
-  LDELFFLAGS += -T $(TOPDIR)/scripts/gnu-elf.ld
-endif
+LDELFFLAGS += $(addprefix -T,$(call CONVERT_PATH,$(TOPDIR)/scripts/gnu-elf.ld))