forked from Imagelibrary/rtems
2004-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>
* aclocal/env-rtemsbsp.m4: Remove CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V. * aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS. * aclocal/prog-cxx.m4: Let CXXFLAGS default to CFLAGS. Don't invoke _RTEMS_FLAGS to set up RTEMS_CXXFLAGS. Remove am__fastdepCXX conditional.
This commit is contained in:
@@ -1,3 +1,13 @@
|
||||
2004-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>
|
||||
|
||||
* aclocal/env-rtemsbsp.m4:
|
||||
Remove CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V.
|
||||
* aclocal/prog-cc.m4:
|
||||
Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS.
|
||||
* aclocal/prog-cxx.m4: Let CXXFLAGS default to CFLAGS.
|
||||
Don't invoke _RTEMS_FLAGS to set up RTEMS_CXXFLAGS.
|
||||
Remove am__fastdepCXX conditional.
|
||||
|
||||
2004-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>
|
||||
|
||||
* automake/compile.am: Remove CLEANDIRS (Unused).
|
||||
|
||||
@@ -8,9 +8,6 @@ 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([RTEMS_BSP_FAMILY],[RTEMS's BSP directory])
|
||||
AC_ARG_VAR([RTEMS_CPU_MODEL],[RTEMS's cpu model])
|
||||
|
||||
|
||||
@@ -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])
|
||||
@@ -39,6 +36,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)"],[
|
||||
|
||||
@@ -8,12 +8,13 @@ AC_DEFUN([RTEMS_PROG_CXX_FOR_TARGET],
|
||||
[
|
||||
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
|
||||
AC_REQUIRE([RTEMS_ENABLE_CXX])
|
||||
|
||||
# If CXXFLAGS is not set, default to CFLAGS
|
||||
CXXFLAGS=${CXXFLAGS-${CFLAGS}}
|
||||
|
||||
RTEMS_CHECK_TOOL(CXX,g++)
|
||||
if test "$RTEMS_HAS_CPLUSPLUS" = "yes";
|
||||
then
|
||||
_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
|
||||
test -z "$CXX" \
|
||||
@@ -27,9 +28,5 @@ AC_PROG_CXX
|
||||
[must both either be cross compilers or native compilers]
|
||||
[Hint: If building a posix bsp: LD_LIBRARY_PATH?] )
|
||||
fi
|
||||
|
||||
else
|
||||
## Work-around to a bug in automake
|
||||
AM_CONDITIONAL([am__fastdepCXX],[false])
|
||||
fi
|
||||
])
|
||||
|
||||
Reference in New Issue
Block a user