changeset 259:87e98a1df774

Merge
author lana
date Thu, 16 Sep 2010 11:18:21 -0700
parents 2a02d4a6955c b331aef4bef0
children b852103caf73
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot-rules.gmk	Wed Sep 15 13:40:23 2010 -0700
+++ b/make/hotspot-rules.gmk	Thu Sep 16 11:18:21 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)