Mercurial > hg > openjdk > jdk7
changeset 217:b331aef4bef0
Merge
author | ohair |
---|---|
date | Tue, 07 Sep 2010 15:51:45 -0700 |
parents | d6ea39e0d3eb (current diff) 90357eee5234 (diff) |
children | 87e98a1df774 ed13debe9a5e |
files | |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)