diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/custom/Solaris-posix.cfg | 12 | ||||
| -rw-r--r-- | make/directory.cfg | 11 |
2 files changed, 21 insertions, 2 deletions
diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg index af8d0c1cfe..aeee569900 100644 --- a/make/custom/Solaris-posix.cfg +++ b/make/custom/Solaris-posix.cfg @@ -41,11 +41,21 @@ CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-solaris2.cfg # Use the LIBC support for CYGNUS newlib # RTEMS_LIBC_DIR must already be set (by module file) -RTEMS_USE_NEWLIB=yes +RTEMS_USE_NEWLIB=no + +LIBC_LIBM=-lm # Define this to yes if C++ is included in the development environment # This requires that at least the GNU C++ compiler and libg++ be installed. +ifeq ($(RTEMS_HAS_CPLUSPLUS),yes) +HAS_CPLUSPLUS=yes +# no standard C++ libs provided by default +LIBCC_INCLUDE=$(GNUTOOLS)/include/g++ +CPLUS_LD_LIBS=-lstdc++ +CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA) +else HAS_CPLUSPLUS=no +endif # Define this to yes if this target supports multiprocessor environments. HAS_MP=yes diff --git a/make/directory.cfg b/make/directory.cfg index 1ae1db84bd..27524ed9fb 100644 --- a/make/directory.cfg +++ b/make/directory.cfg @@ -38,6 +38,15 @@ $(RECURSE_TARGETS): else ifdef RECURSE_TARGETS $(RECURSE_TARGETS): - set -e; for subd in $(SUB_DIRS); do $(MAKE) -w -C $$subd $@; done + @$(ECHO) ; set -e ; \ + if [ "$(SUB_DIRS)" != "" ] ; then \ + sdirs="$(SUB_DIRS)" ; \ + else \ + sdirs="xxx" ; \ + fi ; \ + if [ "$$sdirs" != "xxx" ] ; then \ + for subd in $$sdirs; do $(MAKE) -w -C $$subd $@; done ;\ + fi endif endif + |