diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-09-11 05:02:20 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <rwild@gcc.gnu.org> | 2009-09-11 05:02:20 +0000 |
| commit | 878f62e5bdb9b1adb8f234c36af5c39292c23713 (patch) | |
| tree | 51748ad36944437b6b00ce73b566297a528bc2cc /libjava/Makefile.in | |
| parent | b851135c6cd9f0e436fa4ef3d64e61ddb1148bd0 (diff) | |
| download | gcc-878f62e5bdb9b1adb8f234c36af5c39292c23713.tar.gz gcc-878f62e5bdb9b1adb8f234c36af5c39292c23713.tar.bz2 gcc-878f62e5bdb9b1adb8f234c36af5c39292c23713.zip | |
Override all per-target *_LINK variables correctly.
boehm-gc/:
* Makefile.am (libgcjgc_la_LINK, gctest_LINK): New.
(gctest_LDADD): Depend on libgcjgc.la instead of ./libgcjgc.la,
so that library dependency resolution works with portable make.
* Makefile.in: Regenerate.
libgfortran/:
* Makefile.am (libgfortranbegin_la_LINK): New.
* Makefile.in: Regenerate.
libgomp/:
* Makefile.am (libgomp_la_LINK): New.
* Makefile.in: Regenerate.
libjava/:
* Makefile.am (libgij_la_LINK, libjvm_la_LINK): New.
* Makefile.in: Regenerate.
libstdc++-v3/:
* src/Makefile.am (libstdc___la_LINK): New.
* src/Makefile.in: Regenerate.
From-SVN: r151627
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 9608e7941df..349b9074d34 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -454,14 +454,8 @@ libgcj_bc_la_OBJECTS = $(am_libgcj_bc_la_OBJECTS) @USE_LIBGCJ_BC_TRUE@am_libgcj_bc_la_rpath = -rpath $(toolexeclibdir) am_libgij_la_OBJECTS = gij.lo libgij_la_OBJECTS = $(am_libgij_la_OBJECTS) -libgij_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libgij_la_LDFLAGS) $(LDFLAGS) -o $@ am_libjvm_la_OBJECTS = jni-libjvm.lo libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS) -libjvm_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ - $(CXXFLAGS) $(libjvm_la_LDFLAGS) $(LDFLAGS) -o $@ @CREATE_GJDOC_TRUE@@NATIVE_TRUE@am__EXEEXT_1 = gjdoc$(EXEEXT) @NATIVE_TRUE@am__EXEEXT_2 = jv-convert$(EXEEXT) gij$(EXEEXT) \ @NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ @@ -973,6 +967,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) +libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS) @INTERPRETER_FALSE@libgcj_interpret_source_files = @INTERPRETER_TRUE@libgcj_interpret_source_files = jvmti.cc interpret.cc libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc link.cc \ @@ -1027,6 +1022,7 @@ libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec libjvm_la_LIBADD = -L$(here)/.libs libgcj.la libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC) +libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS) lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) lib_gnu_awt_xlib_la_LIBADD = gnu/awt/xlib.lo gnu/gcj/xlib.lo lib_gnu_awt_xlib_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ |