Merge

1f8dc7c0 · duke · 72c7e879 · ee34ab0c · 1f8dc7c0 · 1f8dc7c0
隐藏空白更改
内联并排

Showing with 6 addition and 1 deletion

.hgtags-top-repo .hgtags-top-repo +1 -0

make/hotspot-rules.gmk make/hotspot-rules.gmk +5 -1

未找到文件。
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -85,3 +85,4 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
 2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
+9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
--- a/make/hotspot-rules.gmk
+++ b/make/hotspot-rules.gmk
@@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug)
 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)