This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: fix PR 26625
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Cc: classpath-patches at gnu dot org
- Date: 05 Apr 2006 16:04:34 -0600
- Subject: Patch: FYI: fix PR 26625
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk and the 4.1 branch.
This fixes PR 26625: we don't rebuild libgcj.jar if a .java file
changes.
I'm checking the Classpath part of this patch in to Classpath as well.
Tom
Index: classpath/ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
PR libgcj/26625:
* lib/Makefile.in: Rebuilt.
* lib/Makefile.am (compile-classes): Touch the output file.
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
PR libgcj/26625:
* Makefile.in: Rebuilt.
* Makefile.am (libgcj-$(gcc_version).jar): Depend on
classpath/lib/compile-classes.
Index: classpath/lib/Makefile.am
===================================================================
--- classpath/lib/Makefile.am (revision 112714)
+++ classpath/lib/Makefile.am (working copy)
@@ -133,6 +133,7 @@
GCJ='$(GCJ)' \
compile_classpath='$(top_builddir):$(compile_classpath)' \
top_srcdir=$(top_srcdir)
+ touch compile-classes
else
compile-classes: classes $(JAVA_SRCS) Makefile
$(JAVAC)
Index: Makefile.am
===================================================================
--- Makefile.am (revision 112714)
+++ Makefile.am (working copy)
@@ -324,7 +324,7 @@
$(mkinstalldirs) `dirname $@`; \
$(LTGCJCOMPILE) -o $@ -c $< -Wc,--resource,$(@:.lo=)
-libgcj-$(gcc_version).jar:
+libgcj-$(gcc_version).jar: classpath/lib/compile-classes
jardir=`dirname $(ZIP)`; \
jardir=`cd $$jardir && pwd`; \
jarname=`basename $(ZIP)`; \