changeset 6410:42a9ca2788e9

Merge
author ohair
date Tue, 07 Sep 2010 15:51:45 -0700
parents bc2db16c1a2a 58edcdfa14fc
children 35137e065cdf b2e02fea81b0
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot-rules.gmk	Tue Sep 07 15:13:58 2010 -0700
+++ b/make/hotspot-rules.gmk	Tue Sep 07 15:51:45 2010 -0700
@@ -73,7 +73,11 @@
 endif
 
 ifeq ($(ZERO_BUILD), true)
-  HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+  ifeq ($(SHARK_BUILD), true)
+    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
+  else
+    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
+  endif
 endif
 
 HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)