aboutsummaryrefslogtreecommitdiff
path: root/libjava/configure
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2011-02-04 05:51:57 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2011-02-04 05:51:57 +0000
commit4e6ad4226d5396500324f8635b116afa777ad6ec (patch)
tree61da8504716f32fbcb8d9fc8e45aabf76d5d8eda /libjava/configure
parent084996f1d1d1f155146370692339e52d895f6c41 (diff)
downloadgcc-4e6ad4226d5396500324f8635b116afa777ad6ec.zip
gcc-4e6ad4226d5396500324f8635b116afa777ad6ec.tar.gz
gcc-4e6ad4226d5396500324f8635b116afa777ad6ec.tar.bz2
Fix PR java/21206: Unrecognized option '-Wl,-rpath' for jv-convert
libjava/: PR java/21206 * configure.ac (LDLIBICONV): New substituted variable, with instances of '-Wl,' removed from LIBICONV. * configure: Regenerate. * libgcj.spec.in: Use @LDLIBICONV@ not @LIBICONV@. * Makefile.in: Regenerate. * gcj/Makefile.in: Likewise. * include/Makefile.in: Likewise. * testsuite/Makefile.in: Likewise. From-SVN: r169822
Diffstat (limited to 'libjava/configure')
-rwxr-xr-xlibjava/configure9
1 files changed, 6 insertions, 3 deletions
diff --git a/libjava/configure b/libjava/configure
index 2fd20a4..481210d 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -674,6 +674,7 @@ GLIB_CFLAGS
GTK_LIBS
GTK_CFLAGS
PKG_CONFIG
+LDLIBICONV
LTLIBICONV
LIBICONV
USING_GCC_FALSE
@@ -13355,7 +13356,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13358 "configure"
+#line 13359 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13461,7 +13462,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13464 "configure"
+#line 13465 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19462,7 +19463,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
enableval=$enable_sjlj_exceptions; :
else
cat > conftest.$ac_ext << EOF
-#line 19465 "configure"
+#line 19466 "configure"
struct S { ~S(); };
void bar();
void foo()
@@ -21993,6 +21994,8 @@ $as_echo "#define HAVE_TZNAME 1" >>confdefs.h
fi
fi
+ LDLIBICONV=`echo " $LIBICONV " | sed "s/${acl_cv_wl--Wl,}/ /g; s/,/ /g"`
+
for ac_func in gethostbyname_r
do :