This is an automated email from the ASF dual-hosted git repository. jerpelea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push: new 9df0272 apps: Let c++ examples/testing depends on UCLIBCXX or LIBCXX 9df0272 is described below commit 9df02722794a2118fe636f2accb4f4c11e4a42d2 Author: Xiang Xiao <xiaoxi...@xiaomi.com> AuthorDate: Wed Jul 1 00:40:36 2020 +0800 apps: Let c++ examples/testing depends on UCLIBCXX or LIBCXX since the test should work with either uClibc++ or libcxx Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com> Change-Id: Ie6d7b1706314cbe82d4e89eb2d5c47ed36118ea4 --- examples/elf/Kconfig | 8 ++++---- examples/elf/tests/helloxx/Makefile | 8 ++++---- testing/README.txt | 4 ++-- testing/cxxtest/README.txt | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/elf/Kconfig b/examples/elf/Kconfig index 8bb752b..3c1a69a 100644 --- a/examples/elf/Kconfig +++ b/examples/elf/Kconfig @@ -120,12 +120,12 @@ config EXAMPLES_ELF_LIBC program greatly increasing the total code size. This option is primarily intended only for testing. -config EXAMPLES_ELF_UCLIBCXX - bool "uClibc++ is installed" +config EXAMPLES_ELF_CXX + bool "uClibc++/libcxx is installed" default n - depends on UCLIBCXX + depends on UCLIBCXX || LIBCXX ---help--- - By default, uClibc++ is not installed and configured. If the + By default, uClibc++/libcxx is not installed and configured. If the user installs and configures the C++ standard library, this example will compile the demos using it. diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile index 6212963..d82e28f 100644 --- a/examples/elf/tests/helloxx/Makefile +++ b/examples/elf/tests/helloxx/Makefile @@ -66,7 +66,7 @@ ALL_BIN += $(FSIMG_DIR)/$(BIN2) ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y) BIN3 = hello++3 ALL_BIN += $(FSIMG_DIR)/$(BIN3) -ifeq ($(CONFIG_EXAMPLES_ELF_UCLIBCXX),y) +ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) BIN4 = hello++4 ALL_BIN += $(FSIMG_DIR)/$(BIN4) BIN5 = hello++5 @@ -83,7 +83,7 @@ OBJS2 = $(SRCS2:.c=$(OBJEXT)) ifeq ($(CONFIG_HAVE_CXXINITIALIZE),y) SRCS3 = $(BIN3).c OBJS3 = $(SRCS3:.c=$(OBJEXT)) -ifeq ($(CONFIG_EXAMPLES_ELF_UCLIBCXX),y) +ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) SRCS4 = $(BIN4).c OBJS4 = $(SRCS4:.c=$(OBJEXT)) SRCS5 = $(BIN5).c @@ -134,7 +134,7 @@ $(BIN3): $(OBJS3) # # NOTE: libstdc++ is not available for NuttX as of this writing # -ifeq ($(CONFIG_EXAMPLES_ELF_UCLIBCXX),y) +ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) $(BIN4): $(OBJS4) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) @@ -166,7 +166,7 @@ ifneq ($(CONFIG_DEBUG_SYMBOLS),y) $(Q) $(STRIP) $(FSIMG_DIR)/$(BIN3) endif -ifeq ($(CONFIG_EXAMPLES_ELF_UCLIBCXX),y) +ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) $(FSIMG_DIR)/$(BIN4): $(BIN4) $(Q) mkdir -p $(FSIMG_DIR) $(Q) install $(BIN4) $(FSIMG_DIR)/$(BIN4) diff --git a/testing/README.txt b/testing/README.txt index 4bcc647..7aa442e 100644 --- a/testing/README.txt +++ b/testing/README.txt @@ -35,9 +35,9 @@ testing/cxxtest CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y - CONFIG_UCLIBCXX=y + CONFIG_UCLIBCXX=y or CONFIG_LIBCXX=y - Additional uClibc++ settings may be required in your build environment. + Additional uClibc++/libcxx settings may be required in your build environment. testing/fstest ============== diff --git a/testing/cxxtest/README.txt b/testing/cxxtest/README.txt index 189a14e..11d8c88 100644 --- a/testing/cxxtest/README.txt +++ b/testing/cxxtest/README.txt @@ -23,6 +23,6 @@ README CONFIG_HAVE_CXX=y CONFIG_HAVE_CXXINITIALIZE=y - CONFIG_UCLIBCXX=y + CONFIG_UCLIBCXX=y or CONFIG_LIBCXX=y - Additional uClibc++ settings may be required in your build environment. + Additional uClibc++/libcxx settings may be required in your build environment.