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

libc and mm/Makefile:Fix an error caused by backslash in Windows native build

Browse Source 
libc and mm/Makefile:Fix an error caused by backslash in Windows native build
This commit is contained in:
zouboan 2022-11-10 21:04:59 +08:00 committed by Xiang Xiao
parent e2c2cc16ee
commit eaea38e0f2
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/libc/Makefile
View File

@ -114,8 +114,8 @@ endif
BINDIR ?= bin BINDIR ?= bin
AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS)) AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT), $(ASRCS))
COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS)) COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT), $(CSRCS))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
@ -126,10 +126,12 @@ BIN ?= libc$(LIBEXT)
all: $(BIN) all: $(BIN)
.PHONY: clean distclean .PHONY: clean distclean
$(AOBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.S $(AOBJS): $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
$(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c # REVISIT: Backslash causes problems in $(COBJS) target
$(COBJS): $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
# C library for the flat build and # C library for the flat build and
@ -194,9 +196,9 @@ distclean:: clean
$(Q) $(MAKE) -C kbin distclean $(Q) $(MAKE) -C kbin distclean
$(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN) $(Q) $(MAKE) -C zoneinfo distclean BIN=$(BIN)
$(call DELFILE, exec_symtab.c) $(call DELFILE, exec_symtab.c)
$(call DELFILE, bin/Make.dep) $(call DELFILE, bin$(DELIM)Make.dep)
$(call DELFILE, kbin/Make.dep) $(call DELFILE, kbin$(DELIM)Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include bin/Make.dep -include bin$(DELIM)Make.dep
-include kbin/Make.dep -include kbin$(DELIM)Make.dep

18
mm/Makefile
View File

@ -37,8 +37,8 @@ BINDIR ?= bin
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)mm CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)mm
AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)%$(OBJEXT), $(ASRCS)) AOBJS = $(patsubst %.S, $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT), $(ASRCS))
COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)%$(OBJEXT), $(CSRCS)) COBJS = $(patsubst %.c, $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT), $(CSRCS))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
@ -49,10 +49,12 @@ BIN ?= libmm$(LIBEXT)
all: $(BIN) all: $(BIN)
.PHONY: clean distclean .PHONY: clean distclean
$(AOBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.S $(AOBJS): $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
$(COBJS): $(BINDIR)$(DELIM)%$(OBJEXT): %.c # REVISIT: Backslash causes problems in $(COBJS) target
$(COBJS): $(BINDIR)$(DELIM)$(DELIM)%$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
# Memory manager for the flat build and # Memory manager for the flat build and
@ -101,9 +103,9 @@ clean:
distclean: clean distclean: clean
$(Q) $(MAKE) -C bin distclean $(Q) $(MAKE) -C bin distclean
$(Q) $(MAKE) -C kbin distclean $(Q) $(MAKE) -C kbin distclean
$(call DELFILE, bin/Make.dep) $(call DELFILE, bin$(DELIM)Make.dep)
$(call DELFILE, kbin/Make.dep) $(call DELFILE, kbin$(DELIM)Make.dep)
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include bin/Make.dep -include bin$(DELIM)Make.dep
-include kbin/Make.dep -include kbin$(DELIM)Make.dep