diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-06 07:13:50 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-06 07:13:50 +0000 |
| commit | c2113d303852f9b6c90985e4d21245fcf6a42d38 (patch) | |
| tree | 8241b230202d4a263f1c6bd3195902d91ac7f11b | |
| parent | 2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-c2113d303852f9b6c90985e4d21245fcf6a42d38.tar.bz2 | |
2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/env-rtemsbsp.m4: Add AC_ARG_VAR for CPU_CFLAGS,
CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V, RTEMS_BSP_FAMILY.
* aclocal/prog-cc.m4: Reworked CFLAGS handling.
* aclocal/prog-cxx.m4: Reworked CXXFLAGS handling.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | aclocal/env-rtemsbsp.m4 | 6 | ||||
| -rw-r--r-- | aclocal/prog-cc.m4 | 9 | ||||
| -rw-r--r-- | aclocal/prog-cxx.m4 | 8 |
4 files changed, 26 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/env-rtemsbsp.m4: Add AC_ARG_VAR for CPU_CFLAGS, + CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V, RTEMS_BSP_FAMILY. + * aclocal/prog-cc.m4: Reworked CFLAGS handling. + * aclocal/prog-cxx.m4: Reworked CXXFLAGS handling. + +2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * aclocal/rtems-flags.m4: New. 2002-12-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/aclocal/env-rtemsbsp.m4 b/aclocal/env-rtemsbsp.m4 index 4f8a8dfc91..898f7449f0 100644 --- a/aclocal/env-rtemsbsp.m4 +++ b/aclocal/env-rtemsbsp.m4 @@ -8,6 +8,12 @@ AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl +AC_ARG_VAR([CPU_CFLAGS],[]) +AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[]) +AC_ARG_VAR([CFLAGS_DEBUG_V],[]) +AC_ARG_VAR([CFLAGS_PROFILE_V],[]) +AC_ARG_VAR([RTEMS_BSP_FAMILY],[]) + AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build]) AC_MSG_CHECKING([for RTEMS_BSP]) AC_CACHE_VAL(rtems_cv_RTEMS_BSP, diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4 index 8876d01112..4ed2f5730c 100644 --- a/aclocal/prog-cc.m4 +++ b/aclocal/prog-cc.m4 @@ -10,6 +10,9 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_BEFORE([$0], [AC_PROG_CC])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl +_RTEMS_FLAGS([CFLAGS], + ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"]) + RTEMS_CHECK_TOOL(CC,gcc) test -z "$CC" && \ AC_MSG_ERROR([no acceptable cc found in \$PATH]) @@ -30,9 +33,7 @@ RTEMS_GCC_PIPE test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe" if test "$GCC" = yes; then -] -m4_if([$1],,[],[CPPFLAGS="$CPPFLAGS $1"]) -[ -CFLAGS=${CFLAGS--g -Wall} +RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall" +m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"]) fi ]) diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4 index 875068c342..8f3f6d09ea 100644 --- a/aclocal/prog-cxx.m4 +++ b/aclocal/prog-cxx.m4 @@ -9,12 +9,20 @@ AC_DEFUN(RTEMS_PROG_CXX, AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl +_RTEMS_FLAGS([CXXFLAGS], + ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"]) + dnl Only accept g++ dnl NOTE: This might be too restrictive RTEMS_CHECK_TOOL(CXX,g++) AC_PROG_CXX test -z "$CXX" \ && AC_MSG_ERROR([no acceptable c++ found in \$PATH]) + +#if test "$GCC" = yes; then +#RTEMS_CXXFLAGS="$RTEMS_CXXFLAGS -Wall" +#m4_if([$1],,[],[RTEMS_CXXFLAGS="$RTEMS_CXXFLAGS $1"]) +#fi ]) AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET, |