Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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