sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace cygpath with CONVERT_PATH

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-02-20 18:00:43 +08:00 committed by Petro Karashchenko
parent 45af16099b
commit bc5d1165aa
4 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Application.mk
View File

@ -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))

6
Make.defs
View File

@ -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)

6
Makefile
View File

@ -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

21
import/Make.defs
View File

@ -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))