Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authoralanb
Tue, 19 Feb 2013 11:32:46 +0000
changeset 15694 4ebce30abdb7
parent 15693 ba31a578f948 (current diff)
parent 15692 859ed6bd0841 (diff)
child 15695 3cd100d3bd6b
Merge
--- a/jdk/makefiles/BuildJdk.gmk	Tue Feb 19 11:08:43 2013 +0000
+++ b/jdk/makefiles/BuildJdk.gmk	Tue Feb 19 11:32:46 2013 +0000
@@ -91,10 +91,11 @@
 	+$(MAKE) -f CopySamples.gmk
 
 # Create the final jdk and jre images, to be wrapped up
-# into packages, or installed.
+# into packages, or installed. Ensure PROFILE is not set
+# in these cases.
 images:
-	+$(MAKE) -f CreateJars.gmk
-	+$(MAKE) -f Images.gmk
+	+$(MAKE) PROFILE="" -f CreateJars.gmk
+	+$(MAKE) PROFILE="" -f Images.gmk
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 	+$(MAKE) -f Bundles.gmk
 endif
jdk-sandbox