aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-12-14 21:44:48 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2009-12-14 21:44:48 +0000
commita5d28a12246b32492c04d4ba551e70481d056363 (patch)
treeafc70981452832c79e8ad5f97b34aaa766e9518b /libjava/configure
parent2fef358e77a240b6853063c2f76729515c9ba6a8 (diff)
downloadgcc-a5d28a12246b32492c04d4ba551e70481d056363.zip
gcc-a5d28a12246b32492c04d4ba551e70481d056363.tar.gz
gcc-a5d28a12246b32492c04d4ba551e70481d056363.tar.bz2
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
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure30
1 files changed, 12 insertions, 18 deletions
diff --git a/libjava/configure b/libjava/configure
index 1a7d625..605225b 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -961,8 +961,15 @@ with_jvm_jar_dir
ac_precious_vars='build_alias
host_alias
target_alias
-CPP
+CC
+CFLAGS
+LDFLAGS
+LIBS
CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CPP
CXXCPP
XMKMF'
ac_subdirs_all='classpath libltdl'
@@ -3339,18 +3346,9 @@ fi
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
-# (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.
-
-
save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fno-builtin"
ac_ext=c
@@ -4406,10 +4404,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
CXXFLAGS="$save_CXXFLAGS"
-
-
-
-
am__api_version='1.11'
# Find a good install program. We prefer a C program (faster),
@@ -13244,7 +13238,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13247 "configure"
+#line 13241 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13350,7 +13344,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13353 "configure"
+#line 13347 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19215,7 +19209,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; :
else
cat > conftest.$ac_ext << EOF
-#line 19218 "configure"
+#line 19212 "configure"
struct S { ~S(); };
void bar();
void foo()