From a5d28a12246b32492c04d4ba551e70481d056363 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Mon, 14 Dec 2009 21:44:48 +0000 Subject: Remove code to un-precious-ize CC, CXX in libjava and v3. libjava/: * configure.ac: Remove code to un-precious-ize CC, CXX, CXXFLAGS, CFLAGS, LDFLAGS. * configure: Regenerate. libstdc++-v3/: * configure.ac: Remove code to un-precious-ize CC, CXX, CXXFLAGS, CFLAGS, LDFLAGS. * configure: Regenerate. From-SVN: r155240 --- libjava/configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index d8cb610..3721e1c 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -142,27 +142,14 @@ AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. GCC_NO_EXECUTABLES -# (1) We use an abnormal CXX (without library references), so we -# must cache it under a different name. -# (2) CC, CFLAGS, CXX, CXXFLAGS, LDFLAGS must not be 'precious', or -# the non-multilib-adjusted value will be used in multilibs. -# (3) As a side effect, we must SUBST CXXFLAGS, CFLAGS, and LDFLAGS ourselves. -# (4) As another side effect, automake doesn't automatically include them -# in Makefile.in. -# (5) For libstdc++-v3, -fno-builtin must be present here so that a +# For libstdc++-v3, -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. This may not be necessary in libjava; I don't know. -m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS]) -m4_define([_AC_ARG_VAR_PRECIOUS],[]) save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-builtin" AC_PROG_CC AC_PROG_CXX CXXFLAGS="$save_CXXFLAGS" -m4_rename_force([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS]) -AC_SUBST(CFLAGS) -AC_SUBST(CXXFLAGS) -AC_SUBST(LDFLAGS) AM_INIT_AUTOMAKE([1.9.0]) -- cgit v1.1