changeset 15692:859ed6bd0841

8008424: Isolate PROFILE make variable from incidental setting in the environment Reviewed-by: erikj, alanb
author dholmes
date Tue, 19 Feb 2013 06:27:20 -0500
parents 0f039e7fe863
children 4ebce30abdb7
files jdk/makefiles/BuildJdk.gmk
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/makefiles/BuildJdk.gmk	Mon Feb 18 15:35:57 2013 -0500
+++ b/jdk/makefiles/BuildJdk.gmk	Tue Feb 19 06:27:20 2013 -0500
@@ -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