changeset 15127:e7c44a9146bf

8005549: build-infra: Merge NewMakefile.gmk and common/makefiles/Makefile Reviewed-by: ohair, tbell
author erikj
date Fri, 28 Dec 2012 09:51:46 +0100
parents bceb690ccf35
children 296bb1620e00
files jdk/makefiles/BuildJdk.gmk
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/makefiles/BuildJdk.gmk	Thu Dec 27 20:18:42 2012 +0100
+++ b/jdk/makefiles/BuildJdk.gmk	Fri Dec 28 09:51:46 2012 +0100
@@ -88,16 +88,15 @@
 # into packages, or installed.
 images:
 	+$(MAKE) -f CreateJars.gmk
-	+$(MAKE) -f Images.gmk 
+	+$(MAKE) -f Images.gmk
+ifeq ($(OPENJDK_TARGET_OS), macosx)
+	+$(MAKE) -f Bundles.gmk
+endif
 
 overlay-images:
 	+$(MAKE) -f CompileLaunchers.gmk OVERLAY_IMAGES=true
 	+$(MAKE) -f Images.gmk overlay-images
 
-# Create platform specific image layouts
-bundles:
-	+$(MAKE) -f Bundles.gmk
-
 BINARIES:=$(notdir $(wildcard $(IMAGES_OUTPUTDIR)/j2sdk-image/bin/*))
 INSTALLDIR:=openjdk-$(RELEASE)