Mercurial > hg > release > icedtea7-2.0

changeset 2194:bb1c7e372811

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR441: Fix hotspot target on --disable-bootstrapping. 2010-03-04 Andrew John Hughes <ahughes@redhat.com> PR 441: * Makefile.am: Don't unset ICEDTEA_BUILD_TARGET if unused. (hotspot): Support the configuration where BOOTSTRAPPING is not set. Pass ICEDTEA_BUILD_TARGET=hotspot to make rather than having an additional hotspot-helper target. Don't remove bootstrap-directory-symlink-ecj.stamp as this just forces the bootstrap classes to be rebuilt. (hotspot-helper): Removed.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 01 Jun 2010 15:56:25 +0100
parents 3c79ac98c366
children ee7e745aa094
files ChangeLog Makefile.am
diffstat 2 files changed, 24 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 04 13:34:40 2010 +0100
+++ b/ChangeLog	Tue Jun 01 15:56:25 2010 +0100
@@ -1,3 +1,14 @@
+2010-03-04  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Don't unset ICEDTEA_BUILD_TARGET if unused.
+	(hotspot): Support the configuration where BOOTSTRAPPING
+	is not set.  Pass ICEDTEA_BUILD_TARGET=hotspot to make rather
+	than having an additional hotspot-helper target.
+	Don't remove bootstrap-directory-symlink-ecj.stamp
+	as this just forces the bootstrap classes to be rebuilt.
+	(hotspot-helper): Removed.
+
 2010-03-04  Xerxes Rånby  <xerxes@zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/Makefile.am	Thu Mar 04 13:34:40 2010 +0100
+++ b/Makefile.am	Tue Jun 01 15:56:25 2010 +0100
@@ -230,7 +230,6 @@
   ICEDTEA_BUILD_TARGET=jdk_only
   ICEDTEA_DEBUG_BUILD_TARGET=jdk_fastdebug_only
 else
-  ICEDTEA_BUILD_TARGET=
   ICEDTEA_DEBUG_BUILD_TARGET=debug_build
 endif
 
@@ -1997,21 +1996,25 @@
 	touch $@
 
 hotspot:
-	rm -f stamps/bootstrap-directory-symlink-stage1.stamp
+if BOOTSTRAPPING
 	rm -f stamps/icedtea-boot.stamp
 	rm -f stamps/icedtea-stage1.stamp
-	$(ARCH_PREFIX) $(MAKE) hotspot-helper
+	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage1
 	mkdir -p \
 	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
 	cp $(BOOT_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
 	   $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
-	@echo "Hotspot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
-
-hotspot-helper: stamps/bootstrap-directory-symlink-stage1.stamp \
-	stamps/plugs.stamp stamps/ports.stamp stamps/patch-boot.stamp
-	$(ARCH_PREFIX) $(MAKE) \
-	  $(ICEDTEA_ENV_BOOT) \
-	  -C openjdk-boot hotspot
+	@echo "HotSpot is served:" $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image
+else
+	rm -f stamps/icedtea.stamp
+	rm -f stamps/icedtea-stage2.stamp
+	$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
+	mkdir -p \
+	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
+	   $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+	@echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
+endif
 
 clean-icedtea-boot: 
 	if [ -e $(abs_top_builddir)/openjdk-boot ]; then \