mirror of
https://github.com/apache/nuttx.git
synced 2026-06-01 07:45:16 +08:00
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:
committed by
YAMAMOTO Takashi
parent
5f85024d8c
commit
3d1159007f
@@ -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)" $(TOPDIR)$(DELIM)sched}
|
||||
|
||||
CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
||||
CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
||||
CXXFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
||||
AFLAGS += $(INCLUDES) $(EXTRAFLAGS)
|
||||
CPPFLAGS += $(INCLUDES)
|
||||
CFLAGS += $(INCLUDES)
|
||||
CXXFLAGS += $(INCLUDES)
|
||||
AFLAGS += $(INCLUDES)
|
||||
|
||||
ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
|
||||
NUTTX = "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx$(EXEEXT)}"
|
||||
@@ -128,7 +128,7 @@ libarch$(LIBEXT): $(OBJS)
|
||||
$(call ARCHIVE, $@, $(OBJS))
|
||||
|
||||
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)
|
||||
@echo "LD: nuttx$(EXEEXT)"
|
||||
|
||||
Reference in New Issue
Block a user