From 752c5e547d44cb973eb70f8ec2158107c0f0dc97 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 22 Jun 2006 18:24:32 +0000 Subject: [PATCH] Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to toolexeclibdir. 2006-06-22 Thomas Fitzsimmons * Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to toolexeclibdir. * Makefile.in: Regenerate. From-SVN: r114900 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 071d27df61a..c5204388d1c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2006-06-22 Thomas Fitzsimmons + + * Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to + toolexeclibdir. + * Makefile.in: Regenerate. + 2006-06-22 Tom Tromey * java/lang/reflect/natField.cc (getAddr): Allow setting of final diff --git a/libjava/Makefile.am b/libjava/Makefile.am index b7221b5c9ba..6404234a4c1 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 5d4c1960256..364e22a5f9a 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)