diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 071d27d..c520438 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2006-06-22 Thomas Fitzsimmons <fitzsim@redhat.com> + + * Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to + toolexeclibdir. + * Makefile.in: Regenerate. + 2006-06-22 Tom Tromey <tromey@redhat.com> * java/lang/reflect/natField.cc (getAddr): Allow setting of final diff --git a/libjava/Makefile.am b/libjava/Makefile.am index b7221b5..6404234 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -240,7 +240,7 @@ libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec ## See jv_convert_LDADD. libjvm_la_LIBADD = -L$(here)/.libs libgcj.la ## The mysterious backslash in the grep pattern is consumed by make. -libjvm_la_LDFLAGS = -rpath $(toolexeclibdir) \ +libjvm_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) ## The .db file. This rule is only used for native builds, so it is diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 5d4c196..364e22a 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -770,7 +770,7 @@ libgcj_la_LINK = $(LIBLINK) libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec libjvm_la_LIBADD = -L$(here)/.libs libgcj.la -libjvm_la_LDFLAGS = -rpath $(toolexeclibdir) \ +libjvm_la_LDFLAGS = \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) lib_gnu_awt_xlib_la_SOURCES = $(xlib_nat_source_files) |