From ea3f5598c074a510272ea7d0cb16b106697e388b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 5 Jan 2005 17:52:33 +0000 Subject: 2005-01-05 Ralf Corsepius * configure.ac: Pass CFLAGS to cpukit configure. * aclocal/rtems-flags.m4: Remove (Unused). * aclocal/prog-ccas.m4: Remove $(GCCSPECS). * aclocal/env-rtemsbsp.m4: Comment out CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CPU_CFLAGS. * aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS. * automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS. Add AM_CXXFLAGS. Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE, ASFLAGS. Cleanup comments. --- c/src/aclocal/env-rtemsbsp.m4 | 6 +++--- c/src/aclocal/prog-cc.m4 | 4 ++-- c/src/aclocal/prog-ccas.m4 | 2 +- c/src/aclocal/rtems-flags.m4 | 11 ----------- 4 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 c/src/aclocal/rtems-flags.m4 (limited to 'c/src/aclocal') diff --git a/c/src/aclocal/env-rtemsbsp.m4 b/c/src/aclocal/env-rtemsbsp.m4 index c7ce949521..6145f1f496 100644 --- a/c/src/aclocal/env-rtemsbsp.m4 +++ b/c/src/aclocal/env-rtemsbsp.m4 @@ -8,9 +8,9 @@ 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],[CFLAGS specifying CPU-dependent features]) -AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant]) -AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant]) +# AC_ARG_VAR([CPU_CFLAGS],[CFLAGS specifying CPU-dependent features]) +# AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant]) +# AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant]) AC_ARG_VAR([RTEMS_BSP_FAMILY],[RTEMS's BSP directory]) AC_ARG_VAR([RTEMS_CPU_MODEL],[RTEMS's cpu model]) diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4 index 7b4335ca17..2267c5d720 100644 --- a/c/src/aclocal/prog-cc.m4 +++ b/c/src/aclocal/prog-cc.m4 @@ -10,8 +10,7 @@ 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"]) +CFLAGS=${CFLAGS-${CPU_CFLAGS} ${CFLAGS_OPTIMIZE_V}} RTEMS_CHECK_TOOL(CC,gcc) test -z "$CC" && \ @@ -39,6 +38,7 @@ if test "$GCC" = yes; then RTEMS_CFLAGS="$RTEMS_CFLAGS -Wall" m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"]) fi +AC_SUBST(RTEMS_CFLAGS) AS_IF([test x"$rtems_cv_gcc_isystem" = x"yes"],[ RTEMS_CPPFLAGS="-isystem \$(PROJECT_INCLUDE)"],[ diff --git a/c/src/aclocal/prog-ccas.m4 b/c/src/aclocal/prog-ccas.m4 index aeef25ec0c..c5b64f561f 100644 --- a/c/src/aclocal/prog-ccas.m4 +++ b/c/src/aclocal/prog-ccas.m4 @@ -3,6 +3,6 @@ AC_DEFUN([RTEMS_PROG_CCAS], [ AC_REQUIRE([RTEMS_PROG_CC]) -AC_SUBST(CCAS,["$CC \$(GCCSPECS)"]) +AC_SUBST(CCAS,["$CC"]) AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"]) ]) diff --git a/c/src/aclocal/rtems-flags.m4 b/c/src/aclocal/rtems-flags.m4 deleted file mode 100644 index 8e034e52c2..0000000000 --- a/c/src/aclocal/rtems-flags.m4 +++ /dev/null @@ -1,11 +0,0 @@ -## $Id$ -## -## Some hacks to set up RTEMS_*FLAGS -## Internal macro, not supposed to be explictly used in configure.ac's - -AC_DEFUN([_RTEMS_FLAGS],[ -AS_IF([test -n "[$]{$1}"], - [RTEMS_$1=[$]{$1}], - [RTEMS_$1=$2]) -AC_SUBST([RTEMS_$1]) -]) -- cgit v1.2.3