Mercurial > hg > openjdk > jdk7
changeset 232:2a7813a9b529
Merge
author | herrick |
---|---|
date | Sat, 02 Oct 2010 11:08:37 -0400 |
parents | 810a461889ab (current diff) c1df968c4527 (diff) |
children | fd3a1c515903 |
files | |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Sep 28 10:29:08 2010 -0700 +++ b/.hgtags Sat Oct 02 11:08:37 2010 -0400 @@ -85,3 +85,5 @@ 140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108 81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109 2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110 +9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111 +b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
--- a/make/hotspot-rules.gmk Tue Sep 28 10:29:08 2010 -0700 +++ b/make/hotspot-rules.gmk Sat Oct 02 11:08:37 2010 -0400 @@ -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)