Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8057132: Build fails if PROFILE is set in the environment
authorerikj
Wed, 03 Sep 2014 14:10:53 +0200
changeset 26285 705a9199d2e4
parent 26284 e94c71fdf7c3
child 26286 8d6d3257c748
child 26398 ca1f84f97e20
8057132: Build fails if PROFILE is set in the environment Reviewed-by: ihse, dholmes, fparain
make/Main.gmk file | annotate | diff | comparison | revisions 
--- 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
jdk-sandbox