changeset 422:910b6e759c5a

Automated merge with http://hg.openjdk.java.net/bsd-port/bsd-port
author astrange
date Thu, 23 Jun 2011 11:05:12 -0700
parents 3dd1621dd154 c2081be0af5f
children 23ef03e243c2
files
diffstat 2 files changed, 18 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Jun 21 05:38:22 2011 -0700
+++ b/.hgignore	Thu Jun 23 11:05:12 2011 -0700
@@ -3,3 +3,4 @@
 /nbproject/private/
 ^webrev
 ^.hgtip
+.DS_Store
--- a/make/hotspot-rules.gmk	Tue Jun 21 05:38:22 2011 -0700
+++ b/make/hotspot-rules.gmk	Thu Jun 23 11:05:12 2011 -0700
@@ -65,11 +65,28 @@
 #
 
 HOTSPOT_TARGET = all_product
+ifeq ($(PLATFORM), macosx)
+ifeq ($(ARCH), universal)
+  HOTSPOT_TARGET = universal_product
+endif
+endif
+
 ifeq ($(DEBUG_NAME), debug)
   HOTSPOT_TARGET = all_debug
+ifeq ($(PLATFORM), macosx)
+ifeq ($(ARCH), universal)
+  HOTSPOT_TARGET = universal_debug
 endif
+endif
+endif
+
 ifeq ($(DEBUG_NAME), fastdebug)
   HOTSPOT_TARGET = all_fastdebug
+ifeq ($(PLATFORM), macosx)
+ifeq ($(ARCH), universal)
+  HOTSPOT_TARGET = universal_fastdebug
+endif
+endif
 endif
 
 ifeq ($(ZERO_BUILD), true)