diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-06 10:45:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-01-06 10:45:41 +0000 |
| commit | 6c2b53247747264a25aa2233706f03fb8fd3970e (patch) | |
| tree | b0aeef37da696b8ee05254430f5e79a715397fd7 | |
| parent | 2005-01-06 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-6c2b53247747264a25aa2233706f03fb8fd3970e.tar.bz2 | |
2005-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>
* configure.ac: Pass CFLAGS to testsuites configure.
* aclocal/prog-cxx.m4: Don't invoke _RTEMS_FLAGS to set up
RTEMS_CXXFLAGS. Setup CXXFLAGS from CFLAGS.
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/aclocal/prog-cxx.m4 | 3 | ||||
| -rw-r--r-- | c/src/configure.ac | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 7fa9dc303f..442052c848 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +2005-01-06 Ralf Corsepius <ralf.corsepius@rtems.org> + + * configure.ac: Pass CFLAGS to testsuites configure. + * aclocal/prog-cxx.m4: Don't invoke _RTEMS_FLAGS to set up + RTEMS_CXXFLAGS. Setup CXXFLAGS from CFLAGS. + 2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org> * configure.ac: Pass CFLAGS to cpukit configure. diff --git a/c/src/aclocal/prog-cxx.m4 b/c/src/aclocal/prog-cxx.m4 index 8991489814..f1c6694da8 100644 --- a/c/src/aclocal/prog-cxx.m4 +++ b/c/src/aclocal/prog-cxx.m4 @@ -11,8 +11,7 @@ AC_REQUIRE([RTEMS_ENABLE_CXX]) RTEMS_CHECK_TOOL(CXX,g++) if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then -_RTEMS_FLAGS([CXXFLAGS], - ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"]) + CXXFLAGS=${CXXFLAGS-${CFLAGS}} dnl Only accept g++ dnl NOTE: This might be too restrictive diff --git a/c/src/configure.ac b/c/src/configure.ac index 0e0561d5ce..6e969ca63a 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -133,7 +133,8 @@ RTEMS_BSP_CONFIG_SUBDIR( ['--with-project-root=${with_project_root}../$RTEMS_BSP/' \ '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \ '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \ - 'CFLAGS="${CFLAGS}"'], + 'CFLAGS="${CFLAGS}"' \ + ], [test x"$multilib" = xno]) ## Note: the order of the directories below is essential @@ -195,7 +196,8 @@ RTEMS_BSP_CONFIG_SUBDIR( '--with-project-root=${with_project_root}../' \ '--with-project-top=${with_project_top}../' \ '--enable-rtemsbsp=$RTEMS_BSP' \ - ], + 'CFLAGS="${CFLAGS}"' \ + ], [test x"$enable_tests" != x"no"]) AC_SUBST([BSP_SUBDIRS],[$BSP_SUBDIRS]) |