summaryrefslogtreecommitdiffstats
path: root/cpukit/aclocal
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-01-05 16:07:20 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-01-05 16:07:20 +0000
commit7ddfdb25e40bcaa2495c668821ad2b03280f20c1 (patch)
tree677e45c5331bc93b8e1d5f2609d2bc12ea610300 /cpukit/aclocal
parent2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
downloadrtems-7ddfdb25e40bcaa2495c668821ad2b03280f20c1.tar.bz2
2005-01-05 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/env-rtemscpu.m4: Remove CFLAGS_OPTIMIZE_V. Remove CPU_CFLAGS. * aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS. * automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS. Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE. Cleanup comments.
Diffstat (limited to 'cpukit/aclocal')
-rw-r--r--cpukit/aclocal/env-rtemscpu.m44
-rw-r--r--cpukit/aclocal/prog-cc.m44
2 files changed, 1 insertions, 7 deletions
diff --git a/cpukit/aclocal/env-rtemscpu.m4 b/cpukit/aclocal/env-rtemscpu.m4
index 9f723b7c7c..65dea4ef49 100644
--- a/cpukit/aclocal/env-rtemscpu.m4
+++ b/cpukit/aclocal/env-rtemscpu.m4
@@ -4,9 +4,5 @@ AC_DEFUN([RTEMS_ENV_RTEMSCPU],
[
AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
- AC_ARG_VAR([CPU_CFLAGS],[])
- AC_ARG_VAR([CFLAGS_OPTIMIZE_V],
- [CFLAGS for building the optimized variant])
-
AM_CONDITIONAL([MULTILIB],[test x"$multilib" = x"yes"])
])
diff --git a/cpukit/aclocal/prog-cc.m4 b/cpukit/aclocal/prog-cc.m4
index 6a4a0d11ac..283cd02b9d 100644
--- a/cpukit/aclocal/prog-cc.m4
+++ b/cpukit/aclocal/prog-cc.m4
@@ -10,9 +10,6 @@ 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])
@@ -34,6 +31,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)"],[