summaryrefslogtreecommitdiffstats
path: root/c/src/configure.ac
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2006-11-15 06:29:07 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2006-11-15 06:29:07 +0000
commitf8235c0751eee9079e901ea7de32808877b4c55b (patch)
tree9715968698e6f6eaa405dfb5f81e939031287548 /c/src/configure.ac
parent206ad76a9cba6f6e1f0b31bc6f5ac1cd1225d72b (diff)
downloadrtems-f8235c0751eee9079e901ea7de32808877b4c55b.tar.bz2
2006-11-15 Ralf Cors├ępius <ralf.corsepius@rtems.org>
* aclocal/prog-cc.m4: Remove CFLAGS. * configure.ac: Don't explictly pass CFLAGS_OPTIMIZE_V, CPU_CFLAGS. Compose CFLAGS. Append CFLAGS to ac_configure_args.
Diffstat (limited to 'c/src/configure.ac')
-rw-r--r--c/src/configure.ac11
1 files changed, 4 insertions, 7 deletions
diff --git a/c/src/configure.ac b/c/src/configure.ac
index 00ba6f66b8..2d3f91d0cf 100644
--- a/c/src/configure.ac
+++ b/c/src/configure.ac
@@ -91,14 +91,14 @@ test -n "${RTEMS_BSP_FAMILY}" && \
AC_CACHE_CHECK([for CPU_CFLAGS],[ac_cv_env_CPU_CFLAGS],
[. ./make/${RTEMS_BSP}.cache])
CPU_CFLAGS=$ac_cv_env_CPU_CFLAGS
-test -n "${CPU_CFLAGS}" && \
- ac_configure_args="$ac_configure_args 'CPU_CFLAGS=${CPU_CFLAGS}'"
AC_CACHE_CHECK([for CFLAGS_OPTIMIZE_V],[ac_cv_env_CFLAGS_OPTIMIZE_V],
[. ./make/${RTEMS_BSP}.cache])
CFLAGS_OPTIMIZE_V=$ac_cv_env_CFLAGS_OPTIMIZE_V
-test -n "${CFLAGS_OPTIMIZE_V}" && \
- ac_configure_args="$ac_configure_args 'CFLAGS_OPTIMIZE_V=${CFLAGS_OPTIMIZE_V}'"
+
+CFLAGS="${CFLAGS-${CPU_CFLAGS} ${CFLAGS_OPTIMIZE_V}}"
+AS_IF([test x"${CFLAGS}" != x" "],[
+ ac_configure_args="$ac_configure_args 'CFLAGS=${CFLAGS}'"])
RTEMS_PROG_CC_FOR_TARGET
AM_PROG_CC_C_O
@@ -125,7 +125,6 @@ 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}"' \
],
[test x"$multilib" = xno])
@@ -195,7 +194,6 @@ RTEMS_BSP_CONFIG_SUBDIR(
'--enable-rtemsbsp=$RTEMS_BSP' \
'--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
'--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
- 'CFLAGS="${CFLAGS}"' \
],
[test x"$enable_tests" != x"no" && test x"$multilib" = xno])
@@ -209,7 +207,6 @@ RTEMS_BSP_CONFIG_SUBDIR(
'--enable-rtemsbsp=$RTEMS_BSP' \
'--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
'--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
- 'CFLAGS="${CFLAGS}"' \
],
[test x"$enable_tests" != x"no" && test x"$multilib" = xyes])