changeset in /hg/icedtea: 2008-03-12 Matthias Klose <doko at ubun...

[doko at ubuntu.com]

changeset fb82a5744082 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=fb82a5744082
description:
	2008-03-12  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk):
	        Find libgcj.so when the version of gcc != the version of gcj.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog                 |    5 +++++
patches/icedtea-ecj.patch |    2 +-

diffs (24 lines):

diff -r f247fb039552 -r fb82a5744082 ChangeLog
--- a/ChangeLog	Wed Mar 12 18:37:04 2008 +0100
+++ b/ChangeLog	Wed Mar 12 18:38:40 2008 +0100
@@ -1,3 +1,8 @@ 2008-03-12  Matthias Klose  <doko at ubuntu
+2008-03-12  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk):
+	Find libgcj.so when the version of gcc != the version of gcj.
+
 2008-03-12  Matthias Klose  <doko at ubuntu.com>
 
 	* configure.ac: Check for ffi.h/libffi.so without pkg-config.
diff -r f247fb039552 -r fb82a5744082 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Wed Mar 12 18:37:04 2008 +0100
+++ b/patches/icedtea-ecj.patch	Wed Mar 12 18:38:40 2008 +0100
@@ -1019,7 +1019,7 @@ diff -ru openjdk-ecj.orig/langtools/make
  		  done)
  JVMLIB          = -L$(BOOTDIR)/jre/lib/$(LIBARCH)/$(VM_NAME) -ljvm
 -JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -ljava $(JVMLIB)
-+JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -lgcj $(JVMLIB)
++JAVALIB         = -L$(BOOTDIR)/jre/lib/$(LIBARCH) -L$(dir $(shell $(if $(GCJ),$(GCJ),$(subst gcc,gcj,$(CC))) --print-file-name=libgcj.so)) -lgcj $(JVMLIB)
  
  #
  # We want to privatize JVM symbols on Solaris. This is so the user can