Changeset 9a4eca5 in rtems
- Timestamp:
- 08/10/16 03:07:29 (8 years ago)
- Branches:
- 5, master
- Children:
- 03c1038
- Parents:
- 709594f0
- git-author:
- Chris Johns <chrisj@…> (08/10/16 03:07:29)
- git-committer:
- Chris Johns <chrisj@…> (08/11/16 07:20:10)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
aclocal/enable-cxx.m4
r709594f0 r9a4eca5 3 3 AC_ARG_ENABLE(cxx, 4 4 [AS_HELP_STRING([--enable-cxx], 5 [enable C++ support and build the rtems++ library])],5 [enable C++ support])], 6 6 [case "${enable_cxx}" in 7 7 yes) RTEMS_HAS_CPLUSPLUS=yes ;; 8 8 no) RTEMS_HAS_CPLUSPLUS=no ;; 9 9 *) AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;; 10 esac], [RTEMS_HAS_CPLUSPLUS= no])10 esac], [RTEMS_HAS_CPLUSPLUS=yes]) 11 11 ]) -
c/src/aclocal/enable-cxx.m4
r709594f0 r9a4eca5 2 2 [ 3 3 AC_ARG_ENABLE(cxx, 4 [AS_HELP_STRING(--enable-cxx,enable C++ support and build the rtems++ library)], 4 [AS_HELP_STRING([--enable-cxx], 5 [enable C++ support])], 5 6 [case "${enable_cxx}" in 6 7 yes) RTEMS_HAS_CPLUSPLUS=yes ;; 7 8 no) RTEMS_HAS_CPLUSPLUS=no ;; 8 9 *) AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;; 9 esac], [RTEMS_HAS_CPLUSPLUS= no])10 esac], [RTEMS_HAS_CPLUSPLUS=yes]) 10 11 ]) -
c/src/aclocal/prog-cxx.m4
r709594f0 r9a4eca5 1 dnl 1 dnl 2 2 dnl Check for target g++ 3 dnl 3 dnl 4 4 5 5 AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET], … … 19 19 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; 20 20 then 21 dnl Only accept g++ 22 dnl NOTE: This might be too restrictive 23 test -z "$CXX" \ 24 && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) 25 AC_PROG_CXX 26 AC_PROG_CXXCPP 27 28 if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then 29 AC_MSG_ERROR([***] 30 [Inconsistency in compiler configuration:] 31 [Target C compiler and target C++ compiler] 32 [must both either be cross compilers or native compilers]) 21 dnl Only accept g++ 22 dnl NOTE: This might be too restrictive 23 if test -z "$CXX"; 24 then 25 RTEMS_HAS_CPLUSPLUS=no 26 HAS_CPLUSPLUS=no 27 ## Work-around to a bug in automake 28 AM_CONDITIONAL([am__fastdepCXX],[false]) 29 else 30 AC_PROG_CXX 31 AC_PROG_CXXCPP 32 if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then 33 AC_MSG_ERROR([***] 34 [Inconsistency in compiler configuration:] 35 [Target C compiler and target C++ compiler] 36 [must both either be cross compilers or native compilers]) 37 fi 33 38 fi 34 39 else 35 ## Work-around to a bug in automake36 AM_CONDITIONAL([am__fastdepCXX],[false])40 ## Work-around to a bug in automake 41 AM_CONDITIONAL([am__fastdepCXX],[false]) 37 42 fi 38 43 ]) -
c/src/configure.ac
r709594f0 r9a4eca5 17 17 RTEMS_ENABLE_MULTILIB 18 18 RTEMS_ENABLE_MULTIPROCESSING 19 RTEMS_ENABLE_CXX 19 20 RTEMS_ENV_RTEMSBSP 20 21 … … 94 95 95 96 RTEMS_PROG_CC_FOR_TARGET 97 RTEMS_PROG_CXX_FOR_TARGET 96 98 AM_PROG_CC_C_O 97 99 RTEMS_PROG_CCAS -
cpukit/configure.ac
r709594f0 r9a4eca5 14 14 RTEMS_ENABLE_MULTIPROCESSING 15 15 RTEMS_ENABLE_POSIX 16 RTEMS_ENABLE_CXX 16 17 RTEMS_ENABLE_RTEMS_DEBUG 17 18 RTEMS_ENABLE_NETWORKING … … 32 33 33 34 RTEMS_PROG_CC_FOR_TARGET 35 RTEMS_PROG_CXX_FOR_TARGET 36 AM_PROG_CC_C_O 37 RTEMS_CANONICALIZE_TOOLS 34 38 RTEMS_PROG_CCAS 35 RTEMS_CANONICALIZE_TOOLS36 AM_PROG_CC_C_O37 39 AC_PROG_RANLIB 38 40 -
testsuites/aclocal/enable-cxx.m4
r709594f0 r9a4eca5 2 2 [ 3 3 AC_ARG_ENABLE(cxx, 4 [AS_HELP_STRING(--enable-cxx,enable C++ support and build the rtems++ library)], 4 [AS_HELP_STRING([--enable-cxx], 5 [enable C++ support])], 5 6 [case "${enable_cxx}" in 6 7 yes) RTEMS_HAS_CPLUSPLUS=yes ;; 7 8 no) RTEMS_HAS_CPLUSPLUS=no ;; 8 9 *) AC_MSG_ERROR(bad value ${enableval} for enable-cxx option) ;; 9 esac], [RTEMS_HAS_CPLUSPLUS= no])10 esac], [RTEMS_HAS_CPLUSPLUS=yes]) 10 11 ]) -
testsuites/aclocal/prog-cxx.m4
r709594f0 r9a4eca5 1 dnl 1 dnl 2 2 dnl Check for target g++ 3 dnl 3 dnl 4 4 5 5 AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET], … … 10 10 11 11 # If CXXFLAGS is not set, default to CFLAGS 12 if test x"$rtems_cv_ RTEMS_SMP" = x"yes" ; then12 if test x"$rtems_cv_HAS_SMP" = x"yes" ; then 13 13 CXXFLAGS=${CXXFLAGS-${CFLAGS} -std=gnu++11} 14 14 else … … 19 19 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; 20 20 then 21 dnl Only accept g++ 22 dnl NOTE: This might be too restrictive 23 test -z "$CXX" \ 24 && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) 25 AC_PROG_CXX 26 AC_PROG_CXXCPP 27 28 if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then 29 AC_MSG_ERROR([***] 30 [Inconsistency in compiler configuration:] 31 [Target C compiler and target C++ compiler] 32 [must both either be cross compilers or native compilers]) 21 dnl Only accept g++ 22 dnl NOTE: This might be too restrictive 23 if test -z "$CXX"; 24 then 25 RTEMS_HAS_CPLUSPLUS=no 26 HAS_CPLUSPLUS=no 27 ## Work-around to a bug in automake 28 AM_CONDITIONAL([am__fastdepCXX],[false]) 29 else 30 AC_PROG_CXX 31 AC_PROG_CXXCPP 32 if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then 33 AC_MSG_ERROR([***] 34 [Inconsistency in compiler configuration:] 35 [Target C compiler and target C++ compiler] 36 [must both either be cross compilers or native compilers]) 37 fi 33 38 fi 34 39 else 35 ## Work-around to a bug in automake36 AM_CONDITIONAL([am__fastdepCXX],[false])40 ## Work-around to a bug in automake 41 AM_CONDITIONAL([am__fastdepCXX],[false]) 37 42 fi 38 43 ]) -
testsuites/configure.ac
r709594f0 r9a4eca5 18 18 RTEMS_PROJECT_ROOT 19 19 20 RTEMS_PROG_CC_FOR_TARGET 21 RTEMS_PROG_CXX_FOR_TARGET 22 RTEMS_CANONICALIZE_TOOLS 23 AM_PROG_CC_C_O 24 20 25 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) 21 RTEMS_PROG_CC22 26 23 27 RTEMS_CHECK_CPUOPTS([RTEMS_POSIX_API])
Note: See TracChangeset
for help on using the changeset viewer.