From 8c52b75d0fd75477b09e0bfec1363b81122b0cea Mon Sep 17 00:00:00 2001 From: David Holmes Date: Tue, 19 Feb 2013 06:27:20 -0500 Subject: [PATCH] 8008424: Isolate PROFILE make variable from incidental setting in the environment Reviewed-by: erikj, alanb --- jdk/makefiles/BuildJdk.gmk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdk/makefiles/BuildJdk.gmk b/jdk/makefiles/BuildJdk.gmk index 927c43a4412..d6c1033df63 100644 --- a/jdk/makefiles/BuildJdk.gmk +++ b/jdk/makefiles/BuildJdk.gmk @@ -91,10 +91,11 @@ demos: +$(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