summaryrefslogtreecommitdiff
path: root/libjava/Makefile.am
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-11 05:02:20 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-09-11 05:02:20 +0000
commitfd5623f3c9125019eeed9530e4b5b7314eeb60b3 (patch)
tree51748ad36944437b6b00ce73b566297a528bc2cc /libjava/Makefile.am
parentd6516a1e4dc5fa9c8294d71afe4db8e8acc0e020 (diff)
downloadgcc-fd5623f3c9125019eeed9530e4b5b7314eeb60b3.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151627 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
-rw-r--r--libjava/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 13b25ac7ea6..7b6750c493c 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -223,6 +223,7 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la
## The mysterious backslash in the grep pattern is consumed by make.
libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
+libgij_la_LINK = $(CXXLINK) $(libgij_la_LDFLAGS)
if INTERPRETER
libgcj_interpret_source_files = jvmti.cc interpret.cc
@@ -326,6 +327,7 @@ libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
## See jv_convert_LDADD.
libjvm_la_LIBADD = -L$(here)/.libs libgcj.la
libjvm_la_LDFLAGS = -avoid-version $(LIBGCJ_LD_SYMBOLIC)
+libjvm_la_LINK = $(CXXLINK) $(libjvm_la_LDFLAGS)
## The .db file. This rule is only used for native builds, so it is
## safe to invoke gcj-dbtool.