From 3afcf0b1c1518196dd026f61e4a7713a6c70016b Mon Sep 17 00:00:00 2001
From: dholmes <unknown>
Date: Thu, 31 Mar 2011 06:54:30 -0400
Subject: [PATCH] 7032775: Include Shark code in the build again Reviewed-by:
 ohair Contributed-by: gbenson@redhat.com, ahughes@redhat.com

---
 make/linux/makefiles/vm.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/linux/makefiles/vm.make b/make/linux/makefiles/vm.make
index d564055c5..cde41b5ca 100644
--- a/make/linux/makefiles/vm.make
+++ b/make/linux/makefiles/vm.make
@@ -142,13 +142,15 @@ COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
 COMPILER2_PATHS += $(GENERATED)/adfiles
 
+SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
+
 # Include dirs per type.
 Src_Dirs/CORE      := $(CORE_PATHS)
 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
 Src_Dirs/TIERED    := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
 Src_Dirs/ZERO      := $(CORE_PATHS)
-Src_Dirs/SHARK     := $(CORE_PATHS)
+Src_Dirs/SHARK     := $(CORE_PATHS) $(SHARK_PATHS)
 Src_Dirs := $(Src_Dirs/$(TYPE))
 
 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
-- 
GitLab