Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorohair
Tue, 07 Sep 2010 15:51:45 -0700
changeset 6410 42a9ca2788e9
parent 6243 bc2db16c1a2a (current diff)
parent 6409 58edcdfa14fc (diff)
child 6411 35137e065cdf
child 6623 b2e02fea81b0
Merge
--- 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)
jdk-sandbox