This is an automated email from the ASF dual-hosted git repository.
yamamoto pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 3d11590 Remove extra application of EXTRAFLAGS and KDEFINE and the
arch-level
3d11590 is described below
commit 3d1159007f550b41b1a6912ab01a468140a8db18
Author: Matias N <mat...@protobits.dev>
AuthorDate: Sun Sep 13 19:14:28 2020 -0300
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
---
arch/arm/src/Makefile | 10 +++++-----
arch/avr/src/Makefile | 10 +++++-----
arch/hc/src/Makefile | 10 +++++-----
arch/mips/src/Makefile | 10 +++++-----
arch/misoc/src/Makefile | 10 +++++-----
arch/or1k/src/Makefile | 10 +++++-----
arch/renesas/src/Makefile | 10 +++++-----
arch/risc-v/src/Makefile | 10 +++++-----
arch/sim/src/Makefile | 10 +++++-----
arch/x86/src/Makefile | 10 +++++-----
arch/x86_64/src/Makefile | 10 +++++-----
arch/xtensa/src/Makefile | 10 +++++-----
arch/z16/src/Makefile | 6 +++---
13 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index c7f87a6..9707ff0 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -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)" $(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)}"
@@ -165,7 +165,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
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)
$(Q) echo "LD: nuttx"
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 607f3e0..e5ab735 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -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)" $(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)}"
@@ -115,7 +115,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"
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 8266d25..d3fd5da 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -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)" $(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)}"
@@ -130,7 +130,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)
$(Q) echo "LD: nuttx"
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 6aa11bd..6b0b51c 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -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)}"
@@ -113,7 +113,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"
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index d3d3bbb..929ea07 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -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)" $(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)}"
@@ -117,7 +117,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)
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile
index 461ab8f..dda734b 100644
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@@ -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)" $(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)}"
@@ -152,7 +152,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
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)
$(Q) echo "LD: nuttx"
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 8a495e0..73b4edd 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -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)" $(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)}"
@@ -124,7 +124,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"
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index 6824471..c084c1c 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -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)" $(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)}"
@@ -155,7 +155,7 @@ $(KBIN): $(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)
$(Q) echo "LD: nuttx"
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index f1257e3..a6e58fc 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -42,10 +42,10 @@ INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)}
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip}
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)
# Determine which objects are required in the link.The
# up_head object normally draws in all that is needed, but
@@ -278,7 +278,7 @@ libarch$(LIBEXT): $(NUTTXOBJS)
# that are not hardware-related.
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)
# Change the names of most symbols that conflict with libc symbols.
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index b6363bb..d5a875b 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -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)"
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 97000b4..3870d38 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -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)" $(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)}"
@@ -123,7 +123,7 @@ $(KBIN): $(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): board/libboard$(LIBEXT)
@echo "LD: nuttx$(EXEEXT)"
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index ac9de8f..cdd0654 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -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)}"
@@ -114,7 +114,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): $(STARTUP_OBJS) board/libboard$(LIBEXT)
@echo "LD: nuttx"
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 5d8476f..c437201 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -28,8 +28,8 @@ INCLUDES += ${shell $(INCDIR) "$(CC)"
$(ARCHSRCDIR)$(DELIM)chip}
INCLUDES += ${shell $(INCDIR) "$(CC)" $(ARCHSRCDIR)$(DELIM)common}
INCLUDES += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)sched}
-CFLAGS += $(INCLUDES) $(EXTRAFLAGS)
-CPPFLAGS += $(INCLUDES) $(EXTRAFLAGS)
+CFLAGS += $(INCLUDES)
+CPPFLAGS += $(INCLUDES)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"
@@ -79,7 +79,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)"
ifeq ($(COMPILER),zneocc.exe)
nuttx.linkcmd: $(LINKCMDTEMPLATE)
