Should guard against these being included if exception support isn't there
This commit is contained in:
Nimish Telang 2022-06-10 00:32:59 -04:00 committed by Xiang Xiao
parent f55523038d
commit 550cb3a1ea

View File

@ -110,10 +110,11 @@ $(BIN3): $(OBJS3)
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
# BIN4 is similar to BIN3 except that it uses the streams code from libstdc++ # 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 # NOTE: libstdc++ is not available for NuttX as of this writing
# #
ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y) ifeq ($(CONFIG_EXAMPLES_ELF_CXX),y)
ifeq ($(CXX_EXCEPTION),y)
$(BIN4): $(OBJS4) $(BIN4): $(OBJS4)
@echo "LD: $<" @echo "LD: $<"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
@ -122,6 +123,7 @@ $(BIN5): $(OBJS5)
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS) $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $@ $(ARCHCRT0OBJ) $^ $(LDLIBS)
endif endif
endif endif
endif
$(FSIMG_DIR)/$(BIN1): $(BIN1) $(FSIMG_DIR)/$(BIN1): $(BIN1)
$(Q) mkdir -p $(FSIMG_DIR) $(Q) mkdir -p $(FSIMG_DIR)