OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to toolexeclibdir. 

2006-06-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libjvm_la_LDFLAGS): Do not set -rpath to
	toolexeclibdir.
	* Makefile.in: Regenerate.

From-SVN: r114900
This commit is contained in:
Thomas Fitzsimmons 2006-06-22 18:24:32 +00:00 committed by Thomas Fitzsimmons
parent 9a171ca4b0
commit 752c5e547d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -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

2
libjava/Makefile.am
View File

@ -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

2
libjava/Makefile.in
View File

@ -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)