From fda2cea18b1db62338a5868bdf5ee2c9509a1752 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 19 Dec 2008 15:57:29 +0100 Subject: re PR libgcj/38396 (ecj1 linked against both -lgcj and -lgcj_bc) PR libgcj/38396 * configure.ac (use_libgcj_bc): Set to no if not enable_shared. (LIBGCJ_SPEC): Use -lgcj instead of -lgcj_bc even for -static or -static-libgcj. * Makefile.am (ecjx_SOURCES): Add ecjx.cc. (ecjx_LDADD): Don't add libgcj.la when NATIVE && USE_LIBBGCJ_BC. * ecjx.cc: New file. * Makefile.in: Regenerated. * configure: Regenerated. From-SVN: r142834 --- libjava/configure.ac | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libjava/configure.ac') diff --git a/libjava/configure.ac b/libjava/configure.ac index 6844057..91adc20 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1046,6 +1046,9 @@ AC_SUBST(THREADCXXFLAGS) AM_CONDITIONAL(USING_POSIX_THREADS, test "$THREADS" = posix) AM_CONDITIONAL(USING_WIN32_THREADS, test "$THREADS" = win32) AM_CONDITIONAL(USING_NO_THREADS, test "$THREADS" = none) +if test "$enable_shared" != yes; then + use_libgcj_bc=no +fi AM_CONDITIONAL(USE_LIBGCJ_BC, test "$use_libgcj_bc" = yes) if test -d sysdep; then true; else mkdir sysdep; fi @@ -1055,7 +1058,7 @@ AC_CONFIG_LINKS(sysdep/descriptor.h:$descriptor_h) LIBGCJ_SPEC="%{s-bc-abi:} -lgcj" if test "$use_libgcj_bc" = yes; then - LIBGCJ_SPEC="%{s-bc-abi:-lgcj_bc;:-lgcj}" + LIBGCJ_SPEC="%{static|static-libgcj|!s-bc-abi:-lgcj;:-lgcj_bc}" fi AC_SUBST(LIBGCJ_SPEC) -- cgit v1.1