You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/12/20 12:52:59 UTC

[incubator-nuttx] branch master updated: boards: Remove CINCPATH and CXXINCPATH

This is an automated email from the ASF dual-hosted git repository.

aguettouche 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 9ea229c  boards: Remove CINCPATH and CXXINCPATH
9ea229c is described below

commit 9ea229cea0deb474223976be47c6b8fa3f33aeb1
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Fri Dec 18 02:37:36 2020 +0800

    boards: Remove CINCPATH and CXXINCPATH
    
    these macro doesn't need anymore with commit:
    commit d32e9c38dfb0659a7f3c0cf586ba1584cd7eb3d6
    Author: Xiang Xiao <xi...@xiaomi.com>
    Date:   Sat Jul 11 18:37:40 2020 +0800
    
    boards: Move the C/C++ search path to the common place
    
    so all boards support uClibc++/libc++ automatically
---
 boards/arm/eoss3/quickfeather/scripts/Make.defs | 6 ------
 boards/renesas/sh1/us7032evb1/scripts/Make.defs | 2 --
 2 files changed, 8 deletions(-)

diff --git a/boards/arm/eoss3/quickfeather/scripts/Make.defs b/boards/arm/eoss3/quickfeather/scripts/Make.defs
index 938cba1..00c996a 100644
--- a/boards/arm/eoss3/quickfeather/scripts/Make.defs
+++ b/boards/arm/eoss3/quickfeather/scripts/Make.defs
@@ -24,12 +24,6 @@ include $(TOPDIR)/arch/arm/src/armv7-m/Toolchain.defs
 
 LDSCRIPT = ld.script
 
-CINCPATH := ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
-CXXINCPATH := ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include$(DELIM)cxx}
-
-ARCHINCLUDES += $(CINCPATH)
-ARCHXXINCLUDES += $(CINCPATH) $(CXXINCPATH)
-
 ifeq ($(CONFIG_CYGWIN_WINTOOL),y)
   ARCHSCRIPT = -T "${shell cygpath -w $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}"
 else
diff --git a/boards/renesas/sh1/us7032evb1/scripts/Make.defs b/boards/renesas/sh1/us7032evb1/scripts/Make.defs
index 5d6d6f0..36aa2b8 100644
--- a/boards/renesas/sh1/us7032evb1/scripts/Make.defs
+++ b/boards/renesas/sh1/us7032evb1/scripts/Make.defs
@@ -29,8 +29,6 @@ ifneq ($(CONFIG_DEBUG_NOOPT),y)
   ARCHOPTIMIZATION += -Os -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-CINCPATH := ${shell $(INCDIR) -s "$(CC)" $(TOPDIR)$(DELIM)include}
-
 ARCHCPUFLAGS = -m1 -fno-builtin
 ARCHPICFLAGS = -fpic
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef