changeset 7514:033f2707ef32

Merge
author alanb
date Tue, 19 Feb 2013 11:32:46 +0000
parents 6f4615fd32da b46c75e221c7
children 00b7535d743f
files
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/makefiles/BuildJdk.gmk	Tue Feb 19 11:08:43 2013 +0000
+++ b/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