changeset 406:85867aad6675

Automated merge with http://hg.openjdk.java.net/bsd-port/bsd-port
author astrange
date Mon, 16 May 2011 15:03:43 -0400
parents 583ad4f14085 ef3cba39b91c
children 349168bf7b91
files
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu May 12 20:54:36 2011 -0700
+++ b/.hgignore	Mon May 16 15:03:43 2011 -0400
@@ -3,3 +3,4 @@
 /nbproject/private/
 ^webrev
 ^.hgtip
+.DS_Store
--- a/make/hotspot-rules.gmk	Thu May 12 20:54:36 2011 -0700
+++ b/make/hotspot-rules.gmk	Mon May 16 15:03:43 2011 -0400
@@ -65,6 +65,9 @@
 #
 
 HOTSPOT_TARGET = all_product
+ifeq ($(PLATFORM), macosx)
+  HOTSPOT_TARGET = universal_product
+endif
 ifeq ($(DEBUG_NAME), debug)
   HOTSPOT_TARGET = all_debug
 endif