Remove extra application of EXTRAFLAGS and KDEFINE and the arch-level
EXTRAFLAGS is already applied to *FLAGS in board's Make.defs (and it applies to whole build, not just arch-code). EXTRAFLAGS is passed around each make call to the complete build. KDEFINE is already added to EXTRAFLAGS in main Makefile so no need to add it again in arch-level Makefile
This commit is contained in:
parent
5f85024d8c
commit
3d1159007f
@ -58,10 +58,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -165,7 +165,7 @@ $(KBIN): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board$(DELIM)libboard$(LIBEXT):
|
board$(DELIM)libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
|
||||||
$(Q) echo "LD: nuttx"
|
$(Q) echo "LD: nuttx"
|
||||||
|
@ -49,10 +49,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -115,7 +115,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx"
|
@echo "LD: nuttx"
|
||||||
|
@ -50,10 +50,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -130,7 +130,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
$(Q) echo "LD: nuttx"
|
$(Q) echo "LD: nuttx"
|
||||||
|
@ -47,10 +47,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -113,7 +113,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx"
|
@echo "LD: nuttx"
|
||||||
|
@ -51,10 +51,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -117,7 +117,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
|
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
|
||||||
|
@ -49,10 +49,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -152,7 +152,7 @@ $(KBIN): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board$(DELIM)libboard$(LIBEXT):
|
board$(DELIM)libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
|
||||||
$(Q) echo "LD: nuttx"
|
$(Q) echo "LD: nuttx"
|
||||||
|
@ -43,10 +43,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -124,7 +124,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx"
|
@echo "LD: nuttx"
|
||||||
|
@ -55,10 +55,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -155,7 +155,7 @@ $(KBIN): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
$(Q) echo "LD: nuttx"
|
$(Q) echo "LD: nuttx"
|
||||||
|
@ -42,10 +42,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
# Determine which objects are required in the link.The
|
# Determine which objects are required in the link.The
|
||||||
# up_head object normally draws in all that is needed, but
|
# up_head object normally draws in all that is needed, but
|
||||||
@ -278,7 +278,7 @@ libarch$(LIBEXT): $(NUTTXOBJS)
|
|||||||
# that are not hardware-related.
|
# that are not hardware-related.
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
# A partially linked object containing only NuttX code (no interface to host OS)
|
# A partially linked object containing only NuttX code (no interface to host OS)
|
||||||
# Change the names of most symbols that conflict with libc symbols.
|
# Change the names of most symbols that conflict with libc symbols.
|
||||||
|
@ -47,10 +47,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -128,7 +128,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx$(EXEEXT)"
|
@echo "LD: nuttx$(EXEEXT)"
|
||||||
|
@ -32,10 +32,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -123,7 +123,7 @@ $(KBIN): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx$(EXEEXT)"
|
@echo "LD: nuttx$(EXEEXT)"
|
||||||
|
@ -47,10 +47,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)common}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)$(ARCH_SUBDIR)}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CXXFLAGS += $(INCLUDES)
|
||||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
AFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||||
@ -114,7 +114,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
nuttx$(EXEEXT): $(STARTUP_OBJS) board/libboard$(LIBEXT)
|
nuttx$(EXEEXT): $(STARTUP_OBJS) board/libboard$(LIBEXT)
|
||||||
@echo "LD: nuttx"
|
@echo "LD: nuttx"
|
||||||
|
@ -28,8 +28,8 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)chip}
|
|||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)common}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)common}
|
||||||
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
|
||||||
|
|
||||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CFLAGS += $(INCLUDES)
|
||||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
CPPFLAGS += $(INCLUDES)
|
||||||
|
|
||||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||||
LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"
|
LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"
|
||||||
@ -79,7 +79,7 @@ libarch$(LIBEXT): $(OBJS)
|
|||||||
$(call ARCHIVE, $@, $(OBJS))
|
$(call ARCHIVE, $@, $(OBJS))
|
||||||
|
|
||||||
board/libboard$(LIBEXT):
|
board/libboard$(LIBEXT):
|
||||||
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
|
$(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
|
||||||
|
|
||||||
ifeq ($(COMPILER),zneocc.exe)
|
ifeq ($(COMPILER),zneocc.exe)
|
||||||
nuttx.linkcmd: $(LINKCMDTEMPLATE)
|
nuttx.linkcmd: $(LINKCMDTEMPLATE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user