Mercurial > hg > release > icedtea6-1.4.1
changeset 335:460ca073dc80
2007-11-08 Lillian Angel <langel@redhat.com>
* Makefile.am: Added check when copying over rt.jar to bootstrap/ecj
* Makefile.in: Regenerated.
| author | Lillian Angel <langel@redhat.com> |
|---|---|
| date | Thu, 08 Nov 2007 13:24:05 -0500 |
| parents | 7130794f3f47 |
| children | d12cd64f7a2c |
| files | ChangeLog Makefile.am Makefile.in |
| diffstat | 3 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Nov 08 17:37:58 2007 +0000 +++ b/ChangeLog Thu Nov 08 13:24:05 2007 -0500 @@ -1,3 +1,8 @@ +2007-11-08 Lillian Angel <langel@redhat.com> + + * Makefile.am: Added check when copying over rt.jar to bootstrap/ecj + * Makefile.in: Regenerated. + 2007-11-07 Gary Benson <gbenson@redhat.com> * patches/icedtea-bytecodeInterpreter.patch: New file.
--- a/Makefile.am Thu Nov 08 17:37:58 2007 +0000 +++ b/Makefile.am Thu Nov 08 13:24:05 2007 -0500 @@ -340,8 +340,8 @@ ln -sf $(XALAN2_SERIALIZER_JAR) \ bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar - mkdir -p bootstrap/ecj/jre - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/ + mkdir -p bootstrap/ecj/jre/lib + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/ mkdir -p stamps touch stamps/bootstrap-directory-ecj.stamp @@ -599,7 +599,10 @@ mkdir -p bootstrap/jdk1.7.0/jre/lib $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \ -C lib/rt javax -C lib/rt sun - mkdir -p bootstrap/jdk1.6.0/jre/lib/ + if test -d bootstrap/ecj/jre/lib ; \ + then \ + cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \ + fi # gcjwebplugin.so. gcjwebplugin.so: gcjwebplugin.cc
--- a/Makefile.in Thu Nov 08 17:37:58 2007 +0000 +++ b/Makefile.in Thu Nov 08 13:24:05 2007 -0500 @@ -833,8 +833,8 @@ ln -sf $(XALAN2_SERIALIZER_JAR) \ bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar ln -sf $(XERCES2_JAR) bootstrap/ecj/lib/endorsed/xerces-j2.jar - mkdir -p bootstrap/ecj/jre - ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/ bootstrap/ecj/jre/ + mkdir -p bootstrap/ecj/jre/lib + ln -sf $(SYSTEM_GCJ_DIR)/jre/lib/i386 bootstrap/ecj/jre/lib/ mkdir -p stamps touch stamps/bootstrap-directory-ecj.stamp @@ -1052,7 +1052,10 @@ mkdir -p bootstrap/jdk1.7.0/jre/lib $(JAR) cf $@ -C lib/rt com -C lib/rt gnu -C lib/rt java \ -C lib/rt javax -C lib/rt sun - mkdir -p bootstrap/jdk1.6.0/jre/lib/ + if test -d bootstrap/ecj/jre/lib ; \ + then \ + cp bootstrap/jdk1.7.0/jre/lib/rt-closed.jar bootstrap/ecj/jre/lib/rt.jar; \ + fi # gcjwebplugin.so. gcjwebplugin.so: gcjwebplugin.cc