summaryrefslogtreecommitdiff
path: root/libstdc++-v3/aclocal.m4
diff options
context:
space:
mode:
authorpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2003-08-11 05:56:33 +0000
committerpme <pme@138bc75d-0d04-0410-961f-82ee72b054a4>2003-08-11 05:56:33 +0000
commitb1e05b1ac87bb2c1f693b6ee340a073ab42b4932 (patch)
tree9a827e1da8a375851f6f8f8b1d0f24414dd79d5a /libstdc++-v3/aclocal.m4
parentf4a06a6475524cae0f273b21a70901a34db5a045 (diff)
downloadgcc-b1e05b1ac87bb2c1f693b6ee340a073ab42b4932.tar.gz
2003-08-11 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONFIGURE): Unprecious CC and CFLAGS when calling AC_PROG_CC. * aclocal.m4, configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70319 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
-rw-r--r--libstdc++-v3/aclocal.m46
1 files changed, 3 insertions, 3 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index d37136d7f2d..df6fb7b1868 100644
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -101,8 +101,6 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
AC_HELP_STRING([--with-newlib],
[assume newlib as a system C library]))
- AC_PROG_CC
-
# We're almost certainly being configured before anything else which uses
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
# we not cache the value of CXX that we "discover" here, because it's set
@@ -115,7 +113,7 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
# wrong (non-multilib-adjusted) value will be used in multilibs. This
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
- # that ourselves.
+ # that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS.
#
# -fno-builtin must be present here so that a non-conflicting form of
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
@@ -125,9 +123,11 @@ AC_DEFUN(GLIBCXX_CONFIGURE, [
m4_define([_AC_ARG_VAR_PRECIOUS],[])
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fno-builtin"
+ AC_PROG_CC
AC_PROG_CXX
CXXFLAGS="$save_CXXFLAGS"
m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+ AC_SUBST(CFLAGS)
AC_SUBST(CXXFLAGS)
# For directory versioning (e.g., headers) and other variables.