Mercurial > hg > release > icedtea6-1.13
changeset 2263:e470c7b5f2dc
Fix hotspot target to only rebuild OpenJDK.
2010-09-19 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(hotspot): Only remake the main icedtea
and icedtea-ecj targets (i.e. the OpenJDK
build) and not the additional targets from
icedtea-against-icedtea and icedtea-against-ecj.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 20 Sep 2010 00:18:57 +0100 |
| parents | 0c7a9312151e |
| children | 2fa7aed828ed |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Sep 19 23:04:46 2010 +0100 +++ b/ChangeLog Mon Sep 20 00:18:57 2010 +0100 @@ -1,3 +1,11 @@ +2010-09-19 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (hotspot): Only remake the main icedtea + and icedtea-ecj targets (i.e. the OpenJDK + build) and not the additional targets from + icedtea-against-icedtea and icedtea-against-ecj. + 2010-09-19 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Sun Sep 19 23:04:46 2010 +0100 +++ b/Makefile.am Mon Sep 20 00:18:57 2010 +0100 @@ -1508,8 +1508,7 @@ hotspot: if BOOTSTRAPPING rm -f stamps/icedtea-ecj.stamp - rm -f stamps/icedtea-against-ecj.stamp - $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj + $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-ecj mkdir -p \ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ @@ -1517,8 +1516,7 @@ @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image else rm -f stamps/icedtea.stamp - rm -f stamps/icedtea-against-icedtea.stamp - $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-icedtea + $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea mkdir -p \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \