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
authorlana
Fri, 24 Sep 2010 16:38:02 -0700
changeset 6412 4dbc2a40aa76
parent 6407 480e9c1f1ada (current diff)
parent 6411 35137e065cdf (diff)
child 6479 7f96f194b139
Merge
--- a/make/hotspot-rules.gmk	Thu Sep 23 17:33:18 2010 -0700
+++ b/make/hotspot-rules.gmk	Fri Sep 24 16:38:02 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