aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorherrick <none@none>2010-10-02 11:08:37 -0400
committerherrick <none@none>2010-10-02 11:08:37 -0400
commita4fbad85999116980af5787db234d5cbcaccda20 (patch)
tree1502e89e669577b72beb2ee6dd2b685a7ad9dfee /make
parent270ba61ab631654f374822442f1c424f48e6a29e (diff)
parent428b912ddc81580377a78e6b14f8b40e131f5427 (diff)
Merge
Diffstat (limited to 'make')
-rw-r--r--make/hotspot-rules.gmk6
1 files changed, 5 insertions, 1 deletions
diff --git a/make/hotspot-rules.gmk b/make/hotspot-rules.gmk
index 72d6f14..9a85b93 100644
--- 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)