OpenJDK / amber / amber
changeset 6412:4dbc2a40aa76
Merge
| author | lana |
|---|---|
| date | Fri, 24 Sep 2010 16:38:02 -0700 |
| parents | 480e9c1f1ada 35137e065cdf |
| children | 7f96f194b139 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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)