2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* aclocal/gcc-pipe.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
	standard).
	* aclocal/gcc-specs.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
	standard).
	* aclocal/multilib.m4: Fix m4-quoting (BUG-FIX).
	* aclocal/check-bsp-cache.m4: Fix m4-quoting (autoconf-2.49b).
	* aclocal/prog-cc.m4: Use $GCC instead of ac_cv_prog_gcc (autoconf
	standard), replace CC_FOR_TARGET with CC (BUG-FIX).
This commit is contained in:
Joel Sherrill
2000-11-09 17:04:53 +00:00
parent 5913d94de8
commit 2dbd07f8dc
6 changed files with 21 additions and 10 deletions

View File

@@ -6,11 +6,11 @@ AC_DEFUN(RTEMS_CHECK_BSP_CACHE,
AC_REQUIRE([RTEMS_CHECK_CPU])dnl sets RTEMS_CPU, target
AC_REQUIRE([RTEMS_ENV_RTEMSBSP])dnl set RTEMS_BSP
AC_REQUIRE([RTEMS_TOP])dnl sets RTEMS_TOPdir
AC_CACHE_CHECK("for RTEMS_CPU_MODEL", rtems_cv_RTEMS_CPU_MODEL,
AC_CACHE_CHECK([for RTEMS_CPU_MODEL], rtems_cv_RTEMS_CPU_MODEL,
. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
RTEMS_CPU_MODEL=$rtems_cv_RTEMS_CPU_MODEL
AC_SUBST(RTEMS_CPU_MODEL)
AC_CACHE_CHECK("for RTEMS_BSP_FAMILY", rtems_cv_RTEMS_BSP_FAMILY,
AC_CACHE_CHECK([for RTEMS_BSP_FAMILY], rtems_cv_RTEMS_BSP_FAMILY,
. $RTEMS_TOPdir/c/[$]$1/make/[$]$1.cache)
RTEMS_BSP_FAMILY=$rtems_cv_RTEMS_BSP_FAMILY
AC_SUBST(RTEMS_BSP_FAMILY)

View File

@@ -10,7 +10,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])
AC_CACHE_CHECK(whether $CC accepts --pipe,rtems_cv_gcc_pipe,
[
rtems_cv_gcc_pipe=no
if test "$ac_cv_prog_gcc" = "yes"; then
if test x"$GCC" = x"yes"; then
echo 'void f(){}' >conftest.c
if test -z "`${CC} --pipe -c conftest.c 2>&1`";then
rtems_cv_gcc_pipe=yes

View File

@@ -9,7 +9,7 @@ AC_DEFUN(RTEMS_GCC_SPECS,
AC_CACHE_CHECK(whether $CC accepts -specs,rtems_cv_gcc_specs,
[
rtems_cv_gcc_specs=no
if test "$ac_cv_prog_gcc" = "yes"; then
if test x"$GCC" = x"yes"; then
touch confspec
echo 'void f(){}' >conftest.c
if test -z "`${CC} -specs confspec -c conftest.c 2>&1`";then

View File

@@ -40,10 +40,10 @@ else
fi
AC_OUTPUT_COMMANDS(
if test -n "$CONFIG_FILES"; then
ac_file=[]ifelse([$1],,Makefile,[$1]) \
. ${multilib_basedir}/../config-ml.in
fi,[
[if test -n "$CONFIG_FILES"; then
ac_file=]ifelse([$1],,Makefile,[$1])[ \
. ${multilib_basedir}/../config-ml.in
fi],[
srcdir=${srcdir}
host=${host}
target=${target}

View File

@@ -17,7 +17,7 @@ test -z "$CC" && \
AC_MSG_ERROR([no acceptable cc found in \$PATH])
AC_PROG_CC
AM_CONDITIONAL(RTEMS_USE_GCC,test x"$ac_cv_prog_gcc" = x"yes")
AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
])
AC_DEFUN(RTEMS_PROG_CC_FOR_TARGET,
@@ -35,7 +35,7 @@ if test "$RTEMS_USE_GCC272" != "yes" ; then
RTEMS_USE_GCC272=yes
fi
fi
test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe"
test "$rtems_cv_gcc_pipe" = "yes" && CC="$CC --pipe"
## Conditional for automake files
AM_CONDITIONAL(RTEMS_USE_GCC272, test x"$RTEMS_USE_GCC272" = x"yes")