changeset 58:5f31d69209e5

6976186: Shark build system changes Summary: Switch to Shark target when SHARK_BUILD is true Reviewed-by: darcy
author gbenson
date Wed, 13 Oct 2010 16:58:14 +0100
parents f0fe79036801
children b1bc3f8a384d c9a6d4ccf874
files make/hotspot-rules.gmk
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/hotspot-rules.gmk	Fri Jun 18 01:18:27 2010 -0700
+++ b/make/hotspot-rules.gmk	Wed Oct 13 16:58:14 2010 +0100
@@ -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)