Mercurial > hg > release > icedtea6-1.11

changeset 1927:546bafa175f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Additional vm builds: Only pass --with-hotspot-src-zip if configured for alternate hotspot 2010-02-19 Matthias Klose <doko@ubuntu.com> * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass --with-hotspot-src-zip if configured for alternate hotspot.
author doko@ubuntu.com
date Fri, 19 Feb 2010 20:25:47 +0100
parents a6ee397f4b59
children 40c6a61591e5
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 19 15:34:31 2010 +0000
+++ b/ChangeLog	Fri Feb 19 20:25:47 2010 +0100
@@ -1,3 +1,8 @@
+2010-02-19  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
+	--with-hotspot-src-zip if configured for alternate hotspot.
+
 2010-02-19 Andrew John Hughes  <ahughes@redhat.com>
 
 	* patches/icedtea-cacao-ignore-jdi-tests.patch:
--- a/Makefile.am	Fri Feb 19 15:34:31 2010 +0000
+++ b/Makefile.am	Fri Feb 19 20:25:47 2010 +0100
@@ -1943,9 +1943,12 @@
 			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS)) \
 	$(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
-	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
+	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP))
+if WITH_ALT_HSBUILD
+ADD_ZERO_CONFIGURE_ARGS += \
 	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
 	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
+endif
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \