diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-05-20 17:06:57 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-05-20 17:06:57 +0000 |
commit | 2efdd08b402f42579548349e62c73c9fe999bc98 (patch) | |
tree | 28856228b02ded770e9e81a935e13ec7cb6bf07c /aclocal/prog-cc.m4 | |
parent | Some patches in place from Brian Stevens which help the Solaris port (diff) | |
download | rtems-2efdd08b402f42579548349e62c73c9fe999bc98.tar.bz2 |
Patch from Ralf Corseipus to fix latent configure problems suddenly triggered:
The breakdown:
* CC_FOR_TARGET and CXX_FOR_TARGET were not correctly re-read
from autoconf's configuration cache (config.cache)
* If <target>-[gcc|g++] was not found while running configure,
the config macros tried to use other (wrong) compilers (e.g. cc).
Changes:
* New RTEMS_PROG_CC macro (aclocal/prog-cc.m4).
* New RTEMS_PROG_CXX macro (aclocal/prog-cxx.m4)
* Moved a shell script fragment from configure.in to a
new m4-autoconf macro (New file: aclocal/tool-prefix.m4)
* Minor changes to configure.in
I tested it with linux/posix (native gcc/primary libc) and
sh-rtems/gensh1 on a linux host and didn't notice any bugs
related to the problems mentioned above. There seem to be
more bugs with the posix bsp, but I consider them minor as
the build run completed successfully. It is just too late
for me to attempt to fix them now.
Diffstat (limited to '')
-rw-r--r-- | aclocal/prog-cc.m4 | 58 |
1 files changed, 24 insertions, 34 deletions
diff --git a/aclocal/prog-cc.m4 b/aclocal/prog-cc.m4 index 7d8a286ec3..864a3c3e07 100644 --- a/aclocal/prog-cc.m4 +++ b/aclocal/prog-cc.m4 @@ -3,22 +3,29 @@ dnl $Id$ dnl dnl Check for target gcc dnl -dnl Adaptation of autoconf-2.12's AC_PROG_CC to rtems -dnl -dnl 98/02/10 Ralf Corsepius (corsepiu@faw.uni-ulm.de) -dnl +dnl 98/05/20 Ralf Corsepius (corsepiu@faw.uni-ulm.de) +dnl Completely reworked AC_DEFUN(RTEMS_PROG_CC, [ AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_BEFORE([$0], [AC_PROG_CC])dnl -AC_CHECK_PROG(CC, gcc, gcc) -if test -z "$CC"; then - AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) - test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -fi +AC_REQUIRE([RTEMS_TOOL_PREFIX])dnl + +dnl Only accept gcc and cc +dnl NOTE: This might be too restrictive for native compilation +AC_PATH_PROGS(CC_FOR_TARGET, "$program_prefix"gcc "$program_prefix"cc ) +test -z "$CC_FOR_TARGET" \ + && AC_MSG_ERROR([no acceptable cc found in \$PATH]) + +dnl backup +rtems_save_CC=$CC +rtems_save_CFLAGS=$CFLAGS + +dnl temporarily set CC +CC=$CC_FOR_TARGET -RTEMS_PROG_CC_WORKS +AC_PROG_CC_WORKS AC_PROG_CC_GNU if test $ac_cv_prog_gcc = yes; then @@ -42,34 +49,17 @@ else test "${CFLAGS+set}" = set || CFLAGS="-g" fi -CC_FOR_TARGET=$CC rtems_cv_prog_gcc=$ac_cv_prog_gcc rtems_cv_prog_cc_g=$ac_cv_prog_cc_g +rtems_cv_prog_cc_works=$ac_cv_prog_cc_works +rtems_cv_prog_cc_cross=$ac_cv_prog_cc_cross dnl restore initial values -unset CC +CC=$rtems_save_CC +CFLAGS=$rtems_save_CFLAGS + unset ac_cv_prog_gcc unset ac_cv_prog_cc_g -unset ac_cv_prog_CC -]) - - -dnl Almost identical to AC_PROG_CC_WORKS -dnl added malloc to program fragment, because rtems has its own malloc -dnl which is not available while bootstrapping rtems - -AC_DEFUN(RTEMS_PROG_CC_WORKS, -[AC_MSG_CHECKING([whether the target C compiler ($CC $CFLAGS $LDFLAGS) works]) -AC_LANG_SAVE -AC_LANG_C -AC_TRY_COMPILER( -[main(){return(0);}], -rtems_cv_prog_cc_works, rtems_cv_prog_cc_cross) -AC_LANG_RESTORE -AC_MSG_RESULT($rtems_cv_prog_cc_works) -if test $rtems_cv_prog_cc_works = no; then - AC_MSG_ERROR([installation or configuration problem: target C compiler cannot create executables.]) -fi -AC_MSG_CHECKING([whether the target C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler]) -AC_MSG_RESULT($rtems_cv_prog_cc_cross) +unset ac_cv_prog_cc_works +unset ac_cv_prog_cc_cross ]) |