changeset 403:ef3cba39b91c

Merge from bsd-port.
author astrange
date Thu, 12 May 2011 23:36:25 -0400
parents 16ffa405157d 5b097416120d
children 85867aad6675
files .hgignore
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sat May 07 21:53:30 2011 -0700
+++ b/.hgignore	Thu May 12 23:36:25 2011 -0400
@@ -3,3 +3,4 @@
 /nbproject/private/
 ^webrev
 ^.hgtip
+.DS_Store
--- a/make/hotspot-rules.gmk	Sat May 07 21:53:30 2011 -0700
+++ b/make/hotspot-rules.gmk	Thu May 12 23:36:25 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