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

Makefile, Application.mk: Clean up cygpath usage

Browse Source 
1.Remove cygpath from the related path since the conversion isn't necessary
2.Call cygpath inplace for the absolute path to avoid the confusion
This commit is contained in:
Xiang Xiao 2019-10-07 02:55:44 -06:00 committed by Gregory Nutt
parent 92e7b1f400
commit c901181a39
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Application.mk
View File

@ -74,18 +74,10 @@ ifneq ($(BUILD_MODULE),y)
OBJS += $(MAINOBJ)
endif
# Module install directory
# Library file
BIN ?= $(APPDIR)$(DELIM)libapps$(LIBEXT)
ifeq ($(WINTOOL),y)
TOOLBIN = "${shell cygpath -w $(BIN)}"
INSTALLDIR = "${shell cygpath -w $(BINDIR)}"
else
TOOLBIN = $(BIN)
INSTALLDIR = $(BINDIR)
endif
ROOTDEPPATH += --dep-path .
VPATH += :.
@ -131,7 +123,11 @@ $(CXXOBJS): %$(OBJEXT): %$(CXXEXT)
$(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@))
.built: $(OBJS)
$(call ARCHIVE, $(TOOLBIN), $(OBJS))
ifeq ($(WINTOOL),y)
$(call ARCHIVE, "${shell cygpath -w $(BIN)}", $(OBJS))
else
$(call ARCHIVE, $(BIN), $(OBJS))
endif
$(Q) touch $@
ifeq ($(BUILD_MODULE),y)
@ -147,11 +143,15 @@ $(MAINOBJ): %$(OBJEXT): %.c
endif
PROGLIST := $(wordlist 1,$(words $(MAINOBJ)),$(PROGNAME))
PROGLIST := $(addprefix $(INSTALLDIR)$(DELIM),$(PROGLIST))
PROGLIST := $(addprefix $(BINDIR)$(DELIM),$(PROGLIST))
PROGOBJ := $(MAINOBJ)
$(PROGLIST): $(MAINOBJ)
ifeq ($(WINTOOL),y)
$(call ELFLD,$(firstword $(PROGOBJ)),"${shell cygpath -w $(firstword $(PROGLIST))}")
else
$(call ELFLD,$(firstword $(PROGOBJ)),$(firstword $(PROGLIST)))
endif
$(eval PROGLIST=$(filter-out $(firstword $(PROGLIST)),$(PROGLIST)))
$(eval PROGOBJ=$(filter-out $(firstword $(PROGOBJ)),$(PROGOBJ)))

11
Makefile
View File

@ -135,19 +135,12 @@ $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) $(SYMTABSRC)
$(SYMTABOBJ): %$(OBJEXT): %.c
ifeq ($(WINTOOL),y)
$(call COMPILE, -fno-lto "${shell cygpath -w $<}", "${shell cygpath -w $@}")
else
$(call COMPILE, -fno-lto $<, $@)
endif
$(BIN): $(SYMTABOBJ)
ifeq ($(WINTOOL),y)
$(call ARCHIVE, $(BIN), "${shell cygpath -w $^}")
else
$(call ARCHIVE, $(BIN), $^)
endif
endif # !CONFIG_BUILD_KERNEL && CONFIG_BUILD_LOADABLE
endif # !CONFIG_BUILD_LOADABLE
.install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)