diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-12-19 15:57:29 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-12-19 15:57:29 +0100 |
| commit | fda2cea18b1db62338a5868bdf5ee2c9509a1752 (patch) | |
| tree | b627927143f54133a2b04d48493cc5adf96da4de /libjava/configure | |
| parent | acd08fa87c2e45c25f52ba12ba019ecb460d73de (diff) | |
| download | gcc-fda2cea18b1db62338a5868bdf5ee2c9509a1752.tar.gz | |
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
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/configure b/libjava/configure index 6d35e46b10b..224ed4cc02a 100755 --- a/libjava/configure +++ b/libjava/configure @@ -20903,6 +20903,9 @@ else USING_NO_THREADS_FALSE= fi +if test "$enable_shared" != yes; then + use_libgcj_bc=no +fi if test "$use_libgcj_bc" = yes; then @@ -20924,7 +20927,7 @@ if test -d sysdep; then true; else mkdir sysdep; fi 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 |