diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-19 14:57:29 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-12-19 14:57:29 +0000 |
| commit | 1c10b9d7f78f9b93f87081076d9f9526f90d5b29 (patch) | |
| tree | b627927143f54133a2b04d48493cc5adf96da4de /libjava/Makefile.am | |
| parent | b2e8a46e7efe8a63e9b9c93ca8e81baebb4af5cd (diff) | |
| download | gcc-1c10b9d7f78f9b93f87081076d9f9526f90d5b29.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142834 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e3ed9b9b24a..d94bb117be5 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -868,7 +868,7 @@ gij_LDADD = -L$(here)/.libs libgij.la gij_DEPENDENCIES = libgij.la ## Build an ecjx from a .jar. -ecjx_SOURCES = +ecjx_SOURCES = ecjx.cc ## We use the BC ABI here so that we don't need to compile ecj.jar. ## Hopefully the user has compiled it into his system .db. ## However, even if not it will run reasonably quickly. @@ -888,10 +888,12 @@ else !ENABLE_SHARED ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH) endif !ENABLE_SHARED -ecjx_LDADD = -L$(here)/.libs libgcj.la +ecjx_LDADD = -L$(here)/.libs ecjx_DEPENDENCIES = libgcj.la libgcj.spec if USE_LIBGCJ_BC ecjx_DEPENDENCIES += libgcj_bc.la +else +ecjx_LDADD += libgcj.la endif else !NATIVE |