sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libs/libxx: Download C++ libraries during context.

Browse Source 
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-08-18 19:31:06 +02:00 committed by Xiang Xiao
parent 9732334b5d
commit 15fb70cb00
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/libxx/Makefile
View File

@ -58,7 +58,7 @@ OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) $(CPPOBJS)
BIN = libxx$(LIBEXT) BIN = libxx$(LIBEXT)
all: $(BIN) all: $(BIN)
.PHONY: depend clean distclean dirlinks .PHONY: depend clean distclean context
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -75,7 +75,7 @@ $(CPPOBJS): %$(OBJEXT): %.cpp
$(BIN): $(OBJS) $(BIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
dirlinks:: context::
makedepfile: $(CXXSRCS:.cxx=.ddx) $(CPPSRCS:.cpp=.ddp) makedepfile: $(CXXSRCS:.cxx=.ddx) $(CPPSRCS:.cpp=.ddp)
$(call CATFILE, Make.dep, $^) $(call CATFILE, Make.dep, $^)

2
libs/libxx/libcxx.defs
View File

@ -33,7 +33,7 @@ libcxx: libcxx-$(VERSION).src.tar.xz
$(TOPDIR)/include/libcxx: libcxx $(TOPDIR)/include/libcxx: libcxx
$(Q) $(DIRLINK) $(CURDIR)/libcxx/include $(TOPDIR)/include/libcxx $(Q) $(DIRLINK) $(CURDIR)/libcxx/include $(TOPDIR)/include/libcxx
dirlinks:: $(TOPDIR)/include/libcxx context:: $(TOPDIR)/include/libcxx
distclean:: distclean::
$(Q) $(DELFILE) libcxx-$(VERSION).src.tar.xz $(Q) $(DELFILE) libcxx-$(VERSION).src.tar.xz

2
libs/libxx/uClibc++.defs
View File

@ -28,7 +28,7 @@ $(TOPDIR)/include/uClibc++:
$(Q) $(DIRLINK) $(CURDIR)/uClibc++/include $(TOPDIR)/include/uClibc++ $(Q) $(DIRLINK) $(CURDIR)/uClibc++/include $(TOPDIR)/include/uClibc++
$(Q) $(COPYFILE) $(CURDIR)/system_configuration.h $(TOPDIR)/include/uClibc++ $(Q) $(COPYFILE) $(CURDIR)/system_configuration.h $(TOPDIR)/include/uClibc++
dirlinks:: $(TOPDIR)/include/uClibc++ context:: $(TOPDIR)/include/uClibc++
distclean:: distclean::
$(Q) $(DELFILE) $(TOPDIR)/include/uClibc++/system_configuration.h $(Q) $(DELFILE) $(TOPDIR)/include/uClibc++/system_configuration.h

3
tools/Directories.mk
View File

@ -97,6 +97,9 @@ endif
endif endif
CONTEXTDIRS += libs$(DELIM)libc CONTEXTDIRS += libs$(DELIM)libc
ifeq ($(CONFIG_HAVE_CXX),y)
CONTEXTDIRS += libs$(DELIM)libxx
endif
ifeq ($(CONFIG_NX),y) ifeq ($(CONFIG_NX),y)
KERNDEPDIRS += graphics KERNDEPDIRS += graphics

1
tools/Makefile.unix
View File

@ -326,7 +326,6 @@ endif
$(Q) touch $@ $(Q) touch $@
dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip drivers/platform dirlinks: include/arch include/arch/board include/arch/chip $(ARCH_SRC)/board $(ARCH_SRC)/chip drivers/platform
$(Q) $(MAKE) -C libs/libxx dirlinks
$(Q) $(MAKE) -C boards dirlinks $(Q) $(MAKE) -C boards dirlinks
$(Q) $(MAKE) -C openamp dirlinks $(Q) $(MAKE) -C openamp dirlinks
$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks $(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks

1
tools/Makefile.win
View File

@ -305,7 +305,6 @@ endif
$(Q) touch $@ $(Q) touch $@
dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip drivers\platform dirlinks: include\arch include\arch\board include\arch\chip $(ARCH_SRC)\board $(ARCH_SRC)\chip drivers\platform
$(Q) $(MAKE) -C libs/libxx dirlinks
$(Q) $(MAKE) -C boards dirlinks $(Q) $(MAKE) -C boards dirlinks
$(Q) $(MAKE) -C openamp dirlinks $(Q) $(MAKE) -C openamp dirlinks
$(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks $(Q) $(MAKE) -C $(CONFIG_APPS_DIR) dirlinks