changeset 26285:705a9199d2e4

8057132: Build fails if PROFILE is set in the environment Reviewed-by: ihse, dholmes, fparain
author erikj
date Wed, 03 Sep 2014 14:10:53 +0200
parents e94c71fdf7c3
children 8d6d3257c748 ca1f84f97e20
files make/Main.gmk
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Main.gmk	Tue Sep 02 11:21:05 2014 -0700
+++ b/make/Main.gmk	Wed Sep 03 14:10:53 2014 +0200
@@ -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