RFR: JDK-8057132: Build fails if PROFILE is set in the environment

[David Holmes]

Such a sense of deja-vu :)

Looks good.

David

On 3/09/2014 8:00 PM, Erik Joelsson wrote:
> Hello,
>
> Please review this small fix for minor regression in the source reorg
> change. Before the change, BuildJdk.gmk would explicitly set PROFILE=""
> when calling CreateJars.gmk or Images.gmk for a normal image build. This
> did not make it over to Main.gmk.
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8057132
> Patch inline:
>
> diff -r 3736cf40d962 make/Main.gmk
> --- a/make/Main.gmk
> +++ b/make/Main.gmk
> @@ -236,11 +236,11 @@
>
>   # Creates the jar files (rt.jar resources.jar etc)
>   main-jars:
> -    +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJars.gmk)
> +    +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE="" -f
> CreateJars.gmk)
>
>   # Creates the images (j2sdk-image j2re-image etc)
>   images:
> -    +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk)
> +    +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) PROFILE="" -f
> Images.gmk)
>           ifeq ($(OPENJDK_TARGET_OS), macosx)
>         +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Bundles.gmk)
>           endif
>