summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-19 16:00:03 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-19 16:00:03 +0000
commitbde6014e8bdc84f97b050526400f074f29d0e148 (patch)
tree9e8899ba33bfc3e764dce5c41289e4d3bdf934f0
parent53872c1368c20869b511272b699cf60a7deec7a3 (diff)
downloadrtems-bde6014e8bdc84f97b050526400f074f29d0e148.tar.bz2
2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/prog-cxx.m4: Remove RTEMS_PROG_CXX. Rework RTEMS_PROG_CXX_FOR_TARGET.
-rw-r--r--ChangeLog5
-rw-r--r--aclocal/prog-cxx.m423
2 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 355a331ff6..c8ee32d2f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * aclocal/prog-cxx.m4: Remove RTEMS_PROG_CXX.
+ Rework RTEMS_PROG_CXX_FOR_TARGET.
+
2002-12-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Remove creating $(ARCH) in compilation rules.
diff --git a/aclocal/prog-cxx.m4 b/aclocal/prog-cxx.m4
index f362284968..8db69bf804 100644
--- a/aclocal/prog-cxx.m4
+++ b/aclocal/prog-cxx.m4
@@ -4,30 +4,22 @@ dnl
dnl Check for target g++
dnl
-AC_DEFUN(RTEMS_PROG_CXX,
+AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
[
-AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
-
+AC_REQUIRE([RTEMS_ENABLE_CXX])
+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
-RTEMS_CHECK_TOOL(CXX,g++)
test -z "$CXX" \
&& AC_MSG_ERROR([no acceptable c++ found in \$PATH])
AC_PROG_CXX
-#if test "$GCC" = yes; then
-#RTEMS_CXXFLAGS="$RTEMS_CXXFLAGS -Wall"
-#m4_if([$1],,[],[RTEMS_CXXFLAGS="$RTEMS_CXXFLAGS $1"])
-#fi
-])
-
-AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
-[
- RTEMS_PROG_CXX
if test "$ac_cv_prog_cc_cross" != "$ac_cv_prog_cxx_cross"; then
AC_MSG_ERROR([***]
[Inconsistency in compiler configuration:]
@@ -35,4 +27,9 @@ AC_DEFUN(RTEMS_PROG_CXX_FOR_TARGET,
[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
])