# HG changeset patch # User dholmes # Date 1361273240 18000 # Node ID 859ed6bd08413b345c532d4b701a8a64950c3436 # Parent 0f039e7fe86396a442b1a31fca04f8a7b7eeded7 8008424: Isolate PROFILE make variable from incidental setting in the environment Reviewed-by: erikj, alanb diff -r 0f039e7fe863 -r 859ed6bd0841 jdk/makefiles/BuildJdk.gmk --- 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