diff options
| -rw-r--r-- | c/src/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/aclocal/prog-cc.m4 | 2 | ||||
| -rw-r--r-- | c/src/configure.ac | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 607e18619e..930f6166f6 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,9 @@ +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. + 2006-10-23 Joel Sherrill <joel@OARcorp.com> * aclocal/rtems-cpu-subdirs.m4: Add bfin. diff --git a/c/src/aclocal/prog-cc.m4 b/c/src/aclocal/prog-cc.m4 index 1d265f293a..cb8c4e86d6 100644 --- a/c/src/aclocal/prog-cc.m4 +++ b/c/src/aclocal/prog-cc.m4 @@ -10,8 +10,6 @@ AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_BEFORE([$0], [AC_PROG_CC])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl -CFLAGS="${CFLAGS-${CPU_CFLAGS} ${CFLAGS_OPTIMIZE_V}}" - RTEMS_CHECK_TOOL(CC,gcc) test -z "$CC" && \ AC_MSG_ERROR([no acceptable cc found in \$PATH]) 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]) |