aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgbenson <none@none>2010-08-24 13:27:45 +0100
committergbenson <none@none>2010-08-24 13:27:45 +0100
commit67360c5b7e46ec27024e4f13c87fb40d3e3338f6 (patch)
tree8555f0ec746e5b5143388fe5a83ff7c2eacae471
parent8856b14967518681741c905debc0f2297b005c4f (diff)
6976186: Integrate Shark
Summary: Shark is a JIT compiler for Zero that uses the LLVM compiler infrastructure. Reviewed-by: ohair
-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)