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
authorduke
Wed, 05 Jul 2017 17:22:39 +0200
changeset 6479 7f96f194b139
parent 6478 75ef8813e3e2 (current diff)
parent 6412 4dbc2a40aa76 (diff)
child 6549 c185fa717e00
Merge
--- a/.hgtags-top-repo	Thu Sep 30 16:00:40 2010 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 17:22:39 2017 +0200
@@ -85,3 +85,4 @@
 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
 2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
+9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
--- a/make/hotspot-rules.gmk	Thu Sep 30 16:00:40 2010 -0700
+++ b/make/hotspot-rules.gmk	Wed Jul 05 17:22:39 2017 +0200
@@ -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