Mercurial > hg > release > icedtea6-1.13

changeset 2957:7d578c967e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1301: PR1171 causes Zero builds to fail 2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com> PR1301: PR1171 causes Zero builds to fail * Makefile.am: (add-archive): Don't run -Xshare:dump if building Zero. (add-archive-debug): Likewise. (add-archive-ecj): Likewise.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Wed, 13 Feb 2013 18:26:57 +0000
parents c3ecc5528bc0
children a31bd9ed229b 55720644035f
files ChangeLog Makefile.am
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 13 18:25:21 2013 +0000
+++ b/ChangeLog	Wed Feb 13 18:26:57 2013 +0000
@@ -1,3 +1,12 @@
+2013-02-08  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR1301: PR1171 causes Zero builds to fail
+	* Makefile.am:
+	(add-archive): Don't run -Xshare:dump if building
+	Zero.
+	(add-archive-debug): Likewise.
+	(add-archive-ecj): Likewise.
+
 2013-02-08  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1297: cacao and jamvm parallel unpack failures
--- a/Makefile.am	Wed Feb 13 18:25:21 2013 +0000
+++ b/Makefile.am	Wed Feb 13 18:26:57 2013 +0000
@@ -1868,11 +1868,13 @@
 stamps/add-archive.stamp: stamps/icedtea.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive.stamp
 
 clean-add-archive:
@@ -1882,11 +1884,13 @@
 stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive-debug.stamp
 
 clean-add-archive-debug:
@@ -2063,11 +2067,13 @@
 stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
 if !ENABLE_JAMVM
 if !ENABLE_CACAO
+if !ZERO_BUILD
 	if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
 	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
 	fi
 endif
 endif
+endif
 	touch stamps/add-archive-ecj.stamp
 
 clean-add-archive-ecj: