diff options
author | Tobias Burnus <burnus@gcc.gnu.org> | 2011-11-09 18:17:57 +0100 |
---|---|---|
committer | Tobias Burnus <burnus@gcc.gnu.org> | 2011-11-09 18:17:57 +0100 |
commit | 60858d8a323af88b5b67b9b40cbd606ba2232f27 (patch) | |
tree | 70456a49b9cecf45c2ccc1e666bdf289143a9bcb /libgfortran/aclocal.m4 | |
parent | 68126bad7bac641c40f6796f451093d07a1798b6 (diff) | |
download | gcc-60858d8a323af88b5b67b9b40cbd606ba2232f27.zip gcc-60858d8a323af88b5b67b9b40cbd606ba2232f27.tar.gz gcc-60858d8a323af88b5b67b9b40cbd606ba2232f27.tar.bz2 |
configure.ac: Make more cross-compile friendly.
2011-11-09 Tobias Burnus <burnus@net-b.de>
* configure.ac: Make more cross-compile friendly.
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
* configure: Regenerate.
From-SVN: r181212
Diffstat (limited to 'libgfortran/aclocal.m4')
-rw-r--r-- | libgfortran/aclocal.m4 | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/libgfortran/aclocal.m4 b/libgfortran/aclocal.m4 index ebf3606..8673daa 100644 --- a/libgfortran/aclocal.m4 +++ b/libgfortran/aclocal.m4 @@ -658,6 +658,41 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 6 + +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 |