diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 20:54:13 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 20:54:13 +0000 |
| commit | 1ea70d78ddbd7347df50103c4a915e140d913f9c (patch) | |
| tree | b626c2aa756c5b84db5a3bd3cedc4da9ccfaa0e9 /aclocal/prog-cc.m4 | |
| parent | 2000-09-12 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-1ea70d78ddbd7347df50103c4a915e140d913f9c.tar.bz2 | |
2000-09-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/check-cxx.m4: Add AC_SUBST(CPLUS_LD_LIBS)
* aclocal/prog-cc.m4: Cleanup comments, require RTEMS_ENABLE_GCC28,
add automake conditionals RTEMS_USE_GCC, RTEMS_USE_GCC272.
* automake/compile.am: Replaced.
* automake/local.am: Remove building variant handling.
Diffstat (limited to '')
| -rw-r--r-- | aclocal/prog-cc.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4 index 337c580152..3cc83ff3c5 100644 --- a/aclocal/prog-cc.m4 +++ b/aclocal/prog-cc.m4 @@ -3,8 +3,6 @@ dnl $Id$ dnl dnl Check for target gcc dnl -dnl 98/05/20 Ralf Corsepius (corsepiu@faw.uni-ulm.de) -dnl Completely reworked AC_DEFUN(RTEMS_PROG_CC, [ @@ -13,6 +11,7 @@ AC_BEFORE([$0], [AC_PROG_CC])dnl AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl AC_REQUIRE([RTEMS_ENABLE_LIBCDIR])dnl +AC_REQUIRE([RTEMS_ENABLE_GCC28])dnl dnl Only accept gcc and cc dnl NOTE: This might be too restrictive for native compilation @@ -64,6 +63,8 @@ unset ac_cv_prog_gcc unset ac_cv_prog_cc_g unset ac_cv_prog_cc_works unset ac_cv_prog_cc_cross + +AM_CONDITIONAL(RTEMS_USE_GCC,test x"$rtems_cv_prog_gcc" = x"yes") ]) AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET, @@ -83,6 +84,11 @@ if test "$RTEMS_USE_GCC272" != "yes" ; then fi test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe" +## Conditional for automake files +AM_CONDITIONAL(RTEMS_USE_GCC272, test x"$RTEMS_USE_GCC272" = x"yes") +## Make variable for autoconf fragments (*.cfg) +AC_SUBST(RTEMS_USE_GCC272) + dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-* case $host_os in *cygwin*) GCCSED="| sed 's%\\\\%/%g'" ;; |