diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-25 16:59:45 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-05-25 16:59:45 +0000 |
| commit | 4baad003eb4756473339a1f11a036e4adb9f7454 (patch) | |
| tree | 5c065c5b5ddaca208481e58ce228f3f42df64e19 /libjava/configure | |
| parent | aa3d8448c54ad0617c50e8a42b3e9627b3b1ef3f (diff) | |
| download | gcc-4baad003eb4756473339a1f11a036e4adb9f7454.tar.gz | |
PR libgcj/44216
* configure.ac (libgcj_cv_exidx): Enable AC_LANG_WERROR.
Save and restore werror flag.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159833 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure index 6be8109031a..8f549050da2 100755 --- a/libjava/configure +++ b/libjava/configure @@ -599,6 +599,7 @@ ac_includes_default="\ #endif" enable_option_checking=no +ac_c_werror_flag= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -13338,7 +13339,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13341 "configure" +#line 13342 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13444,7 +13445,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13447 "configure" +#line 13448 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19423,7 +19424,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 19426 "configure" +#line 19427 "configure" struct S { ~S(); }; void bar(); void foo() @@ -20528,6 +20529,14 @@ if test "${libgcj_cv_exidx+set}" = set; then : else saved_ldflags="$LDFLAGS" LDFLAGS="${LDFLAGS} -Wl,--no-merge-exidx-entries" + # The IRIX 6 ld doesn't recognize --no-merge-exidx-entries, but only + # warns about unknown options, which breaks the testsuite. So enable + # AC_LANG_WERROR, but there's currently (autoconf 2.64) no way to turn + # it off again. As a workaround, save and restore werror flag like + # AC_PATH_XTRA. + ac_xsave_c_werror_flag=$ac_c_werror_flag + +ac_c_werror_flag=yes if test x$gcc_no_link = xyes; then as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 fi @@ -20542,6 +20551,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + ac_c_werror_flag=$ac_xsave_c_werror_flag LDFLAGS="${saved_ldflags}" fi |