Mercurial > hg > icedtea11
changeset 2386:280e9959fbea
Provide tools.jar in first stage bootstrap.
2011-05-18 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(bootstrap-directory-stage1): Link tools.jar
if available. Otherwise, link to existing rt.jar.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 18 May 2011 20:50:26 +0100 |
| parents | 0bea9271a681 |
| children | fac8966dc7fb |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 16 16:52:29 2011 +0200 +++ b/ChangeLog Wed May 18 20:50:26 2011 +0100 @@ -1,3 +1,9 @@ +2011-05-18 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (bootstrap-directory-stage1): Link tools.jar + if available. Otherwise, link to existing rt.jar. + 2011-05-16 Pavel Tisnovsky <ptisnovs@redhat.com> * test/jtreg/README:
--- a/Makefile.am Mon May 16 16:52:29 2011 +0200 +++ b/Makefile.am Wed May 18 20:50:26 2011 +0100 @@ -1601,7 +1601,13 @@ mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ - chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar && \ + chmod u+w $(STAGE1_BOOT_DIR)/jre/lib/rt.jar + mkdir -p $(STAGE1_BOOT_DIR)/lib && \ + if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \ + ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + else \ + ln -sf $(STAGE1_BOOT_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \ + fi ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \ $(STAGE1_BOOT_DIR)/jre/lib/ && \ if ! test -d $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \