This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 550cb3a1ea3c76080c63c23c23a93b7018f164d0 Author: Nimish Telang <[email protected]> AuthorDate: Fri Jun 10 00:32:59 2022 -0400 Address #190 Should guard against these being included if exception support isn't there --- examples/elf/tests/helloxx/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/elf/tests/helloxx/Makefile b/examples/elf/tests/helloxx/Makefile index 90124073c..19ec33152 100644 --- a/examples/elf/tests/helloxx/Makefile +++ b/examples/elf/tests/helloxx/Makefile @@ -110,10 +110,11 @@ $(BIN3): $(OBJS3) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) # BIN4 is similar to BIN3 except that it uses the streams code from libstdc++ -# +# Both BIN4 and BIN5 use exceptions # NOTE: libstdc++ is not available for NuttX as of this writing # ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) +ifeq ($(CXX_EXCEPTION),y) $(BIN4): $(OBJS4) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) @@ -122,6 +123,7 @@ $(BIN5): $(OBJS5) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) endif endif +endif $(FSIMG_DIR)/$(BIN1): $(BIN1) $(Q) mkdir -p $(FSIMG_DIR)
